You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/04/06 12:45:21 UTC
[incubator-iotdb] branch optimize_travis updated (d61a9f3 ->
7921d1e)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from d61a9f3 use travis official openjkd11 in LinuxOS
new d9df9b8 optimize travis to reduce unnecessary test and enhance the readability
new c559d84 make site available only when use -Pwebsite command
new cc7cbb7 re-organize coveralls test
new 68325f8 revert site to do not use website profile
new 261fa91 fix converalls:report command
new 5e0b819 add temp folder for download JDK
new ff177c9 use travis official openjkd11 in LinuxOS
new b8a3937 remove unused codes
new 7921d1e remove unused codes
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 1 -
pom.xml | 2 --
2 files changed, 3 deletions(-)
[incubator-iotdb] 01/09: optimize travis to reduce unnecessary test
and enhance the readability
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit d9df9b8636fa5a27f7e80cb59ee17acf6dcad367
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sat Apr 4 16:34:42 2020 +0800
optimize travis to reduce unnecessary test and enhance the readability
---
.travis.yml | 109 +++++++++++++++---------------------------------------------
1 file changed, 27 insertions(+), 82 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index d3b3605..b45bbe5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,17 +31,6 @@ matrix:
- os: osx
osx_image: xcode10.1 # with JDK11.0.1+13 installed
name: osx-oraclejdk11
- script:
- - rm -rf /Users/travis/.m2/repository/org/apache/maven/plugins
- - rm -rf /Users/travis/.m2/repository/org/apache/tomcat
- - java -version
- - mvn -version
- - mvn -B apache-rat:check
- # Output something every 10 minutes or Travis kills the job
- - while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- - mvn -B clean package -pl server,grafana,client,example,:kafka-example,:rocketmq-example -am integration-test
- # Killing background sleep loop
- - kill %1
- os: osx
osx_image: xcode9.3 # with JDK1.8.0_112-b16 installed
name: osx-oraclejdk8
@@ -55,17 +44,6 @@ matrix:
- AdoptOpenJDK/openjdk
update: true
casks: adoptopenjdk-openjdk11
- script:
- - rm -rf /Users/travis/.m2/repository/org/apache/maven/plugins
- - rm -rf /Users/travis/.m2/repository/org/apache/tomcat
- - java -version
- - mvn -version
- - mvn -B apache-rat:check
- # Output something every 10 minutes or Travis kills the job
- - while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- - mvn -B clean package -pl server,grafana,client,example,:kafka-example,:rocketmq-example -am integration-test
- # Killing background sleep loop
- - kill %1
- os: osx
osx_image: xcode9.3 # with JDK1.8.0_112-b16 installed
name: osx-openjdk8
@@ -76,23 +54,20 @@ matrix:
- AdoptOpenJDK/openjdk
update: true
casks: adoptopenjdk-openjdk8
- # - os: windows
- # language: c
- # name: win-oraclejdk11
- # install:
- # - choco install jdk11 -params 'installdir=c:\\java11'
- # - export PATH=$PATH:"/c/java11/bin"
- # - export JAVA_HOME="/c/java11"
- # - wget -q https://www-eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip
- # - /C/Progra~1/7-Zip/7z.exe x apache-maven-3.6.3-bin.zip -o/c/mvn363
- # - export "MAVEN_HOME=/c/mvn363/apache-maven-3.6.3"
- # - export "M2_HOME=/c/mvn363/apache-maven-3.6.3"
- # - export "PATH=$MAVEN_HOME/bin:$PATH"
- # script:
- # - java -version
- # - mvn -version
- # - mvn -B clean package -pl server,grafana,client,example,:kafka-example,:rocketmq-example -am integration-test
-
+ - os: linux
+ name: linux-openjdk11
+ dist: xenial
+ sudo: required
+ before_install:
+ - wget https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O jdk11.tar.gz
+ - tar -xzf jdk11.tar.gz
+ before_script:
+ - export JAVA_HOME=$PWD/jdk-11.0.2/
+ - export PATH=$JAVA_HOME/bin:$PATH
+ - os: linux
+ name: linux-openjdk8
+ dist: xenial
+ jdk: openjdk8
- os: windows
language: c
name: win-openjdk11
@@ -125,7 +100,6 @@ matrix:
- wget --no-check-certificate https://github.com/cdarlint/winutils/raw/master/hadoop-2.7.3/bin/winutils.pdb -o C:\hadoop\bin
- wget --no-check-certificate https://github.com/cdarlint/winutils/raw/master/hadoop-2.7.3/bin/yarn -o C:\hadoop\bin
- wget --no-check-certificate https://github.com/cdarlint/winutils/raw/master/hadoop-2.7.3/bin/yarn.cmd -o C:\hadoop\bin
-
before_script:
- export "JAVA_HOME=/c/java/jdk-11.0.2"
- export "PATH=$JAVA_HOME/bin:$PATH"
@@ -140,45 +114,10 @@ matrix:
- mvn -version
# Output something every 10 minutes or Travis kills the job
- while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- - travis_wait 40 mvn -B clean integration-test
- # Killing background sleep loop
- - kill %1
-
- - os: linux
- name: linux-openjdk11
- dist: xenial
- sudo: required
- before_install:
- - wget https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O jdk11.tar.gz
- - tar -xzf jdk11.tar.gz
- before_script:
- - export JAVA_HOME=$PWD/jdk-11.0.2/
- - export PATH=$JAVA_HOME/bin:$PATH
- script:
- - java -version
- # Output something every 10 minutes or Travis kills the job
- - while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- - mvn -B clean package -pl server,grafana,client,example,:kafka-example,:rocketmq-example -am integration-test
+ - travis_wait 40 mvn -B clean test integration-test -pl '!distribution','!site' -am
# Killing background sleep loop
- kill %1
- os: linux
- name: linux-openjdk8
- dist: xenial
- jdk: openjdk8
-# - os: linux
-# name: linux-oraclejdk8
-# dist: xenial
-# jdk: oraclejdk8
-# - os: linux
-# name: linux-oraclejdk11
-# dist: trusty
-# jdk: oraclejdk11
-# script:
-# - java -version
-# - mvn -version
-# - mvn -B apache-rat:check
-# - mvn -B clean package -pl server,grafana,client,example,:kafka-example,:rocketmq-example -am integration-test
- - os: linux
if: fork = false #only fork=true (i.e., the committer has permission to write the repo)
name: sonar-analysis
dist: xenial
@@ -190,7 +129,7 @@ matrix:
token:
secure: "a2n2+MFfuOb3hsrw5vjiIUZzjt6S0j4YmRVrms6NVKF+EpEAWU/zOjzfccLGRr3VFUAlkoM2p578c/0DMMGew2oj3Yl1iJe2n35BWIV6r/psUKRUMdgMAogdshQzZGMYmY1XL2xA3ATu8cf4F8WoRAafd/S58JGQdTfsQ5svh31BxK0iuh+nMIZb4dYxO717dSVD45D9hoF5ROxdtTRbyAaXFPs5djxWrdzKw0J3e6a8m82K9FGcpy4pY9ct3ttbyEzGqMnzE4fhd3KgopFJj+3QdAi/3Cmkf1voxorQdCSbktl4PtlzMY/nxF6XETI2E4T+GLUVMw4iHiXCabqwOiudGnEj5DjNz6X5MVCOyj7lrFBTlDirGzv9fNpvQ2I47WOL8DzBJPqFwQ0nRAlbvcWVtE4aAqj8YF1QwwLxEIi4abDfOwaxGG2TOixQf627pvhh1o0RdEf9R6aRyur7vbM [...]
script:
- - mvn verify sonar:sonar -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-iotdb -DskipTests
+ - mvn verify sonar:sonar -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-iotdb -DskipTests -pl '!distribution','!site' -am
- os: linux
if: fork = false #only fork=true (i.e., the committer has permission to write the repo)
name: code-coverage
@@ -198,7 +137,7 @@ matrix:
jdk: openjdk8
script:
# now, grafana has no tests; spark-* tests are written by scala
- - mvn post-integration-test -Pcode-coverage
+ - mvn post-integration-test -Pcode-coverage -pl '!distribution','!site' -am
- mvn coveralls:report -Dservice_name=travis_ci -pl tsfile,jdbc,server,session,client,hadoop,hive-connector
- os: linux
@@ -222,9 +161,15 @@ before_install: true
install: true
script:
- - java -version
- - ./mvnw.sh -B -ntp apache-rat:check
- - ./mvnw.sh -B -ntp clean integration-test
-
+ - rm -rf /Users/travis/.m2/repository/org/apache/maven/plugins
+ - rm -rf /Users/travis/.m2/repository/org/apache/tomcat
+ - java -version
+ - mvn -version
+ - mvn -B apache-rat:check
+ # Output something every 10 minutes or Travis kills the job
+ - while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
+ - mvn -B clean test integration-test -pl '!site' -am
+ # Killing background sleep loop
+ - kill %1
after_success:
[incubator-iotdb] 05/09: fix converalls:report command
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 261fa919d10b4d9507c60cb11fd6950ec0998ae9
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Apr 5 12:37:20 2020 +0800
fix converalls:report command
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index b2ac1e3..d276656 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -140,7 +140,7 @@ matrix:
script:
# now, grafana has no tests; spark-* tests are written by scala
- mvn post-integration-test -Pcode-coverage -Pcoveralls -pl '!site','!distribution' -am
- - mvn coveralls:report -Dservice_name=travis_ci -pl '!grafana','!spark-iotdb-connector','!spark-tsfile','!distribution','!site' -am
+ - mvn coveralls:report -Dservice_name=travis_ci -pl tsfile,server,jdbc,client,session,hive-connector,flink-iotdb-connector
#- mvn coveralls:report -Dservice_name=travis_ci -Pcoveralls
- os: linux
name: website checker
[incubator-iotdb] 06/09: add temp folder for download JDK
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 5e0b81926d5163bdaf787fad5602080e268e50c9
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Apr 5 13:09:29 2020 +0800
add temp folder for download JDK
---
.travis.yml | 2 ++
pom.xml | 2 ++
2 files changed, 4 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index d276656..112abb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,8 @@ matrix:
- wget https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O jdk11.tar.gz
- tar -xzf jdk11.tar.gz
before_script:
+ - mv jdk-11.0.2 downloadJDK
+ - rm -rf jdk11.tar.gz
- export JAVA_HOME=$PWD/jdk-11.0.2/
- export PATH=$JAVA_HOME/bin:$PATH
- os: linux
diff --git a/pom.xml b/pom.xml
index 1c4c80a..5f4eec0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -559,6 +559,8 @@
<exclude>LICENSE-binary</exclude>
<!-- json does not support comments-->
<exclude>**/*.json</exclude>
+ <!-- downloadJDK is used by travis-CI only-->
+ <exclude>downloadJDK</exclude>
</excludes>
</configuration>
</plugin>
[incubator-iotdb] 09/09: remove unused codes
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 7921d1e8a95ea246826330af96f260ae27c41775
Merge: b8a3937 d61a9f3
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Apr 6 20:45:01 2020 +0800
remove unused codes
[incubator-iotdb] 08/09: remove unused codes
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit b8a39375c1a54de45a86c80e7356d38c3d023366
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Apr 6 20:43:58 2020 +0800
remove unused codes
---
.travis.yml | 1 -
pom.xml | 2 --
2 files changed, 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f9bc3c4..7932cdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -137,7 +137,6 @@ matrix:
# now, grafana has no tests; spark-* tests are written by scala
- mvn post-integration-test -Pcode-coverage -Pcoveralls -pl '!site','!distribution' -am
- mvn coveralls:report -Dservice_name=travis_ci -pl tsfile,server,jdbc,client,session,hive-connector,flink-iotdb-connector
- #- mvn coveralls:report -Dservice_name=travis_ci -Pcoveralls
- os: linux
name: website checker
dist: xenial
diff --git a/pom.xml b/pom.xml
index 5f4eec0..1c4c80a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -559,8 +559,6 @@
<exclude>LICENSE-binary</exclude>
<!-- json does not support comments-->
<exclude>**/*.json</exclude>
- <!-- downloadJDK is used by travis-CI only-->
- <exclude>downloadJDK</exclude>
</excludes>
</configuration>
</plugin>
[incubator-iotdb] 02/09: make site available only when use
-Pwebsite command
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit c559d8418037bc20353c604b5b6810459991c378
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Apr 5 08:50:06 2020 +0800
make site available only when use -Pwebsite command
---
.travis.yml | 15 +-
Jenkinsfile | 2 +-
site/README.md | 2 +-
site/pom.xml | 691 +++++++++++++++++++++++++++++----------------------------
4 files changed, 358 insertions(+), 352 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index b45bbe5..129ab83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -114,7 +114,9 @@ matrix:
- mvn -version
# Output something every 10 minutes or Travis kills the job
- while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- - travis_wait 40 mvn -B clean test integration-test -pl '!distribution','!site' -am
+ # we do not build site on Win
+ # we do not build distribution for save time
+ - travis_wait 40 mvn -B clean test integration-test -pl '!distribution' -am
# Killing background sleep loop
- kill %1
- os: linux
@@ -129,7 +131,7 @@ matrix:
token:
secure: "a2n2+MFfuOb3hsrw5vjiIUZzjt6S0j4YmRVrms6NVKF+EpEAWU/zOjzfccLGRr3VFUAlkoM2p578c/0DMMGew2oj3Yl1iJe2n35BWIV6r/psUKRUMdgMAogdshQzZGMYmY1XL2xA3ATu8cf4F8WoRAafd/S58JGQdTfsQ5svh31BxK0iuh+nMIZb4dYxO717dSVD45D9hoF5ROxdtTRbyAaXFPs5djxWrdzKw0J3e6a8m82K9FGcpy4pY9ct3ttbyEzGqMnzE4fhd3KgopFJj+3QdAi/3Cmkf1voxorQdCSbktl4PtlzMY/nxF6XETI2E4T+GLUVMw4iHiXCabqwOiudGnEj5DjNz6X5MVCOyj7lrFBTlDirGzv9fNpvQ2I47WOL8DzBJPqFwQ0nRAlbvcWVtE4aAqj8YF1QwwLxEIi4abDfOwaxGG2TOixQf627pvhh1o0RdEf9R6aRyur7vbM [...]
script:
- - mvn verify sonar:sonar -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-iotdb -DskipTests -pl '!distribution','!site' -am
+ - mvn verify sonar:sonar -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-iotdb -DskipTests -pl '!distribution' -am
- os: linux
if: fork = false #only fork=true (i.e., the committer has permission to write the repo)
name: code-coverage
@@ -137,15 +139,14 @@ matrix:
jdk: openjdk8
script:
# now, grafana has no tests; spark-* tests are written by scala
- - mvn post-integration-test -Pcode-coverage -pl '!distribution','!site' -am
- - mvn coveralls:report -Dservice_name=travis_ci -pl tsfile,jdbc,server,session,client,hadoop,hive-connector
-
+ - mvn post-integration-test -Pcode-coverage -pl '!distribution' -am
+ - mvn coveralls:report -Dservice_name=travis_ci -pl '!grafana','!spark-iotdb-connector','!spark-tsfile','!distribution','!site'
- os: linux
name: website checker
dist: xenial
jdk: openjdk8
script:
- - mvn clean package -pl site
+ - mvn clean package -pl site -Pwebsite
cache:
directories:
@@ -168,7 +169,7 @@ script:
- mvn -B apache-rat:check
# Output something every 10 minutes or Travis kills the job
- while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- - mvn -B clean test integration-test -pl '!site' -am
+ - mvn -B clean test integration-test
# Killing background sleep loop
- kill %1
diff --git a/Jenkinsfile b/Jenkinsfile
index d5ae674..291d926 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -147,7 +147,7 @@ pipeline {
}
steps {
// Publish the site with the scm-publish plugin.
- sh 'mvn package scm-publish:publish-scm -pl site'
+ sh 'mvn package scm-publish:publish-scm -pl site -Pwebsite'
// Clean up the snapshots directory (freeing up more space after deploying).
dir("target") {
diff --git a/site/README.md b/site/README.md
index 4e47d8b..da7d80b 100644
--- a/site/README.md
+++ b/site/README.md
@@ -27,7 +27,7 @@ See https://iotdb.apache.org/
## Build Setup
-run `mvn site -DskipTests` for:
+run `mvn package -DskipTests -Pwebsite` for:
- get docs from the master branch and all lagecy docs remotely.
- download node.js and npm;
diff --git a/site/pom.xml b/site/pom.xml
index 8f4a0c5..0ded820 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -37,353 +37,358 @@
<url>scm:git:https://gitbox.apache.org/repos/asf/incubator-iotdb-website.git</url>
</site>
</distributionManagement>
- <build>
- <plugins>
- <!-- copy source codes into vue required folders-->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-source-code-to-docs-folder</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>website</id>
+ <build>
+ <plugins>
+ <!-- copy source codes into vue required folders-->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-source-code-to-docs-folder</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Copy master documents-->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-master-docs-to-docs</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/../docs</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-other-md-files-to-development</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/vue-source/src/Development</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/../tsfile</directory>
+ <includes>
+ <include>format-changelist.md</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../service-rpc</directory>
+ <includes>
+ <include>rpc-changelist.md</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-other-md-files-to-zh-development</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/vue-source/src/zh/Development</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/../tsfile</directory>
+ <includes>
+ <include>format-changelist.md</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../service-rpc</directory>
+ <includes>
+ <include>rpc-changelist.md</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- mv UserGuide of master into master folder -->
+ <plugin>
+ <groupId>com.coderplus.maven.plugins</groupId>
+ <artifactId>copy-rename-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>copy-package-json</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <fileSets>
+ <fileSet>
+ <sourceFile>${basedir}/src/main/package.json</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/package.json</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile>${basedir}/src/main/deploy.js</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/deploy.js</destinationFile>
+ </fileSet>
+ </fileSets>
+ </configuration>
+ </execution>
+ <execution>
+ <id>mv-master-userguide-to-tmp-folder</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>${project.build.directory}/vue-source/src/UserGuide</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/src/tmpUserGuide/master</destinationFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>mv-master-zh-userguide-to-tmp-folder</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>${project.build.directory}/vue-source/src/zh/UserGuide</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide/master</destinationFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- download lagecy docs from iotdb repo -->
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.3.0</version>
+ <executions>
+ <execution>
+ <id>get-0.9-docs</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>https://github.com/apache/incubator-iotdb/archive/rel/0.9.zip</url>
+ <outputDirectory>${project.build.directory}/download</outputDirectory>
+ <outputFileName>0.9.x.zip</outputFileName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>get-0.8-docs</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>https://github.com/apache/incubator-iotdb/archive/rel/0.8.zip</url>
+ <outputDirectory>${project.build.directory}/download</outputDirectory>
+ <outputFileName>0.8.x.zip</outputFileName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- unpack lagecy docs from the zip files-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>truezip-maven-plugin</artifactId>
+ <version>1.2</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>copy-0.9-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+ <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/UserGuide</directory>
+ <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.9.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-0.9-zh-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+ <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/zh/UserGuide</directory>
+ <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.9.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-0.8-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+ <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/UserGuide</directory>
+ <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.8.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-0.8-zh-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+ <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/zh/UserGuide</directory>
+ <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.8.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- mv UserGuide of master back -->
+ <plugin>
+ <groupId>com.coderplus.maven.plugins</groupId>
+ <artifactId>copy-rename-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>mv-master-userguide-to-docs</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>${project.build.directory}/vue-source/src/tmpUserGuide</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/src/UserGuide</destinationFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>mv-master-zh-userguide-to-docs</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/src/zh/UserGuide</destinationFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!--install node and npm， then run `npm install` and `npm run build`-->
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.9.1</version>
<configuration>
- <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/src/main/</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <installDirectory>${project.build.directory}/tools</installDirectory>
+ <workingDirectory>${project.build.directory}/vue-source</workingDirectory>
</configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Copy master documents-->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-master-docs-to-docs</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
+ <executions>
+ <execution>
+ <id>install-node-and-npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <nodeVersion>v11.5.0</nodeVersion>
+ <npmVersion>6.4.1</npmVersion>
+ </configuration>
+ </execution>
+ <!-- Install all project dependencies -->
+ <execution>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <!-- optional: default phase is "generate-resources" -->
+ <phase>package</phase>
+ <!-- Optional configuration which provides for running any npm command -->
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
+ <!-- Build and minify static files -->
+ <execution>
+ <id>npm run build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>run build</arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
- <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/../docs</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <!-- mono-module doesn't require site:stage -->
+ <content>${project.build.directory}/vue-source/src/.vuepress/dist</content>
+ <!-- branch where to deploy -->
+ <scmBranch>asf-site</scmBranch>
</configuration>
- </execution>
- <execution>
- <id>copy-other-md-files-to-development</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
+ </plugin>
+ <plugin>
+ <groupId>org.simplify4u.plugins</groupId>
+ <artifactId>sitemapxml-maven-plugin</artifactId>
<configuration>
- <outputDirectory>${project.build.directory}/vue-source/src/Development</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/../tsfile</directory>
- <includes>
- <include>format-changelist.md</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/../service-rpc</directory>
- <includes>
- <include>rpc-changelist.md</include>
- </includes>
- </resource>
- </resources>
+ <siteOutputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist</siteOutputDirectory>
+ <maxDepth>5</maxDepth>
</configuration>
- </execution>
- <execution>
- <id>copy-other-md-files-to-zh-development</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/vue-source/src/zh/Development</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/../tsfile</directory>
- <includes>
- <include>format-changelist.md</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/../service-rpc</directory>
- <includes>
- <include>rpc-changelist.md</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- mv UserGuide of master into master folder -->
- <plugin>
- <groupId>com.coderplus.maven.plugins</groupId>
- <artifactId>copy-rename-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>copy-package-json</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <fileSets>
- <fileSet>
- <sourceFile>${basedir}/src/main/package.json</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/package.json</destinationFile>
- </fileSet>
- <fileSet>
- <sourceFile>${basedir}/src/main/deploy.js</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/deploy.js</destinationFile>
- </fileSet>
- </fileSets>
- </configuration>
- </execution>
- <execution>
- <id>mv-master-userguide-to-tmp-folder</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>rename</goal>
- </goals>
- <configuration>
- <sourceFile>${project.build.directory}/vue-source/src/UserGuide</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/src/tmpUserGuide/master</destinationFile>
- </configuration>
- </execution>
- <execution>
- <id>mv-master-zh-userguide-to-tmp-folder</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>rename</goal>
- </goals>
- <configuration>
- <sourceFile>${project.build.directory}/vue-source/src/zh/UserGuide</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide/master</destinationFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- download lagecy docs from iotdb repo -->
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <version>1.3.0</version>
- <executions>
- <execution>
- <id>get-0.9-docs</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
- <url>https://github.com/apache/incubator-iotdb/archive/rel/0.9.zip</url>
- <outputDirectory>${project.build.directory}/download</outputDirectory>
- <outputFileName>0.9.x.zip</outputFileName>
- </configuration>
- </execution>
- <execution>
- <id>get-0.8-docs</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
- <url>https://github.com/apache/incubator-iotdb/archive/rel/0.8.zip</url>
- <outputDirectory>${project.build.directory}/download</outputDirectory>
- <outputFileName>0.8.x.zip</outputFileName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- unpack lagecy docs from the zip files-->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>truezip-maven-plugin</artifactId>
- <version>1.2</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>copy-0.9-documentation</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <fileset>
- <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/UserGuide</directory>
- <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.9.x</outputDirectory>
- </fileset>
- </configuration>
- </execution>
- <execution>
- <id>copy-0.9-zh-documentation</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <fileset>
- <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/zh/UserGuide</directory>
- <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.9.x</outputDirectory>
- </fileset>
- </configuration>
- </execution>
- <execution>
- <id>copy-0.8-documentation</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <fileset>
- <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/UserGuide</directory>
- <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.8.x</outputDirectory>
- </fileset>
- </configuration>
- </execution>
- <execution>
- <id>copy-0.8-zh-documentation</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <fileset>
- <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/zh/UserGuide</directory>
- <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.8.x</outputDirectory>
- </fileset>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- mv UserGuide of master back -->
- <plugin>
- <groupId>com.coderplus.maven.plugins</groupId>
- <artifactId>copy-rename-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>mv-master-userguide-to-docs</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>rename</goal>
- </goals>
- <configuration>
- <sourceFile>${project.build.directory}/vue-source/src/tmpUserGuide</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/src/UserGuide</destinationFile>
- </configuration>
- </execution>
- <execution>
- <id>mv-master-zh-userguide-to-docs</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>rename</goal>
- </goals>
- <configuration>
- <sourceFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/src/zh/UserGuide</destinationFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!--install node and npm， then run `npm install` and `npm run build`-->
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>1.9.1</version>
- <configuration>
- <installDirectory>${project.build.directory}/tools</installDirectory>
- <workingDirectory>${project.build.directory}/vue-source</workingDirectory>
- </configuration>
- <executions>
- <execution>
- <id>install-node-and-npm</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <nodeVersion>v11.5.0</nodeVersion>
- <npmVersion>6.4.1</npmVersion>
- </configuration>
- </execution>
- <!-- Install all project dependencies -->
- <execution>
- <id>npm install</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <!-- optional: default phase is "generate-resources" -->
- <phase>package</phase>
- <!-- Optional configuration which provides for running any npm command -->
- <configuration>
- <arguments>install</arguments>
- </configuration>
- </execution>
- <!-- Build and minify static files -->
- <execution>
- <id>npm run build</id>
- <phase>package</phase>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>run build</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <!-- mono-module doesn't require site:stage -->
- <content>${project.build.directory}/vue-source/src/.vuepress/dist</content>
- <!-- branch where to deploy -->
- <scmBranch>asf-site</scmBranch>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.simplify4u.plugins</groupId>
- <artifactId>sitemapxml-maven-plugin</artifactId>
- <configuration>
- <siteOutputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist</siteOutputDirectory>
- <maxDepth>5</maxDepth>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>gen</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>gen</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
[incubator-iotdb] 04/09: revert site to do not use website profile
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 68325f816bd15ede4b3b67828af7e266619b5b27
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Apr 5 11:27:00 2020 +0800
revert site to do not use website profile
---
.travis.yml | 6 +-
Jenkinsfile | 2 +-
site/README.md | 2 +-
site/pom.xml | 691 ++++++++++++++++++++++++++++-----------------------------
4 files changed, 348 insertions(+), 353 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 80eb436..b2ac1e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -139,7 +139,7 @@ matrix:
jdk: openjdk8
script:
# now, grafana has no tests; spark-* tests are written by scala
- - mvn post-integration-test -Pcode-coverage -Pcoveralls
+ - mvn post-integration-test -Pcode-coverage -Pcoveralls -pl '!site','!distribution' -am
- mvn coveralls:report -Dservice_name=travis_ci -pl '!grafana','!spark-iotdb-connector','!spark-tsfile','!distribution','!site' -am
#- mvn coveralls:report -Dservice_name=travis_ci -Pcoveralls
- os: linux
@@ -147,7 +147,7 @@ matrix:
dist: xenial
jdk: openjdk8
script:
- - mvn clean package -pl site -Pwebsite
+ - mvn clean package -pl site
cache:
directories:
@@ -170,7 +170,7 @@ script:
- mvn -B apache-rat:check
# Output something every 10 minutes or Travis kills the job
- while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- - mvn -B clean test integration-test
+ - mvn -B clean test integration-test -pl '!site' -am
# Killing background sleep loop
- kill %1
diff --git a/Jenkinsfile b/Jenkinsfile
index 291d926..d5ae674 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -147,7 +147,7 @@ pipeline {
}
steps {
// Publish the site with the scm-publish plugin.
- sh 'mvn package scm-publish:publish-scm -pl site -Pwebsite'
+ sh 'mvn package scm-publish:publish-scm -pl site'
// Clean up the snapshots directory (freeing up more space after deploying).
dir("target") {
diff --git a/site/README.md b/site/README.md
index da7d80b..87b7325 100644
--- a/site/README.md
+++ b/site/README.md
@@ -27,7 +27,7 @@ See https://iotdb.apache.org/
## Build Setup
-run `mvn package -DskipTests -Pwebsite` for:
+run `mvn package -DskipTests -pl site` for:
- get docs from the master branch and all lagecy docs remotely.
- download node.js and npm;
diff --git a/site/pom.xml b/site/pom.xml
index 0ded820..8f4a0c5 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -37,358 +37,353 @@
<url>scm:git:https://gitbox.apache.org/repos/asf/incubator-iotdb-website.git</url>
</site>
</distributionManagement>
- <profiles>
- <profile>
- <id>website</id>
- <build>
- <plugins>
- <!-- copy source codes into vue required folders-->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-source-code-to-docs-folder</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/src/main/</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Copy master documents-->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-master-docs-to-docs</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/../docs</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-other-md-files-to-development</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/vue-source/src/Development</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/../tsfile</directory>
- <includes>
- <include>format-changelist.md</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/../service-rpc</directory>
- <includes>
- <include>rpc-changelist.md</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-other-md-files-to-zh-development</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/vue-source/src/zh/Development</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/../tsfile</directory>
- <includes>
- <include>format-changelist.md</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/../service-rpc</directory>
- <includes>
- <include>rpc-changelist.md</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- mv UserGuide of master into master folder -->
- <plugin>
- <groupId>com.coderplus.maven.plugins</groupId>
- <artifactId>copy-rename-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>copy-package-json</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <fileSets>
- <fileSet>
- <sourceFile>${basedir}/src/main/package.json</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/package.json</destinationFile>
- </fileSet>
- <fileSet>
- <sourceFile>${basedir}/src/main/deploy.js</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/deploy.js</destinationFile>
- </fileSet>
- </fileSets>
- </configuration>
- </execution>
- <execution>
- <id>mv-master-userguide-to-tmp-folder</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>rename</goal>
- </goals>
- <configuration>
- <sourceFile>${project.build.directory}/vue-source/src/UserGuide</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/src/tmpUserGuide/master</destinationFile>
- </configuration>
- </execution>
- <execution>
- <id>mv-master-zh-userguide-to-tmp-folder</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>rename</goal>
- </goals>
- <configuration>
- <sourceFile>${project.build.directory}/vue-source/src/zh/UserGuide</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide/master</destinationFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- download lagecy docs from iotdb repo -->
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <version>1.3.0</version>
- <executions>
- <execution>
- <id>get-0.9-docs</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
- <url>https://github.com/apache/incubator-iotdb/archive/rel/0.9.zip</url>
- <outputDirectory>${project.build.directory}/download</outputDirectory>
- <outputFileName>0.9.x.zip</outputFileName>
- </configuration>
- </execution>
- <execution>
- <id>get-0.8-docs</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
- <url>https://github.com/apache/incubator-iotdb/archive/rel/0.8.zip</url>
- <outputDirectory>${project.build.directory}/download</outputDirectory>
- <outputFileName>0.8.x.zip</outputFileName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- unpack lagecy docs from the zip files-->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>truezip-maven-plugin</artifactId>
- <version>1.2</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>copy-0.9-documentation</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <fileset>
- <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/UserGuide</directory>
- <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.9.x</outputDirectory>
- </fileset>
- </configuration>
- </execution>
- <execution>
- <id>copy-0.9-zh-documentation</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <fileset>
- <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/zh/UserGuide</directory>
- <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.9.x</outputDirectory>
- </fileset>
- </configuration>
- </execution>
- <execution>
- <id>copy-0.8-documentation</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <fileset>
- <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/UserGuide</directory>
- <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.8.x</outputDirectory>
- </fileset>
- </configuration>
- </execution>
- <execution>
- <id>copy-0.8-zh-documentation</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <fileset>
- <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/zh/UserGuide</directory>
- <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.8.x</outputDirectory>
- </fileset>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- mv UserGuide of master back -->
- <plugin>
- <groupId>com.coderplus.maven.plugins</groupId>
- <artifactId>copy-rename-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>mv-master-userguide-to-docs</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>rename</goal>
- </goals>
- <configuration>
- <sourceFile>${project.build.directory}/vue-source/src/tmpUserGuide</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/src/UserGuide</destinationFile>
- </configuration>
- </execution>
- <execution>
- <id>mv-master-zh-userguide-to-docs</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>rename</goal>
- </goals>
- <configuration>
- <sourceFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/src/zh/UserGuide</destinationFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!--install node and npm， then run `npm install` and `npm run build`-->
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>1.9.1</version>
+ <build>
+ <plugins>
+ <!-- copy source codes into vue required folders-->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-source-code-to-docs-folder</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
<configuration>
- <installDirectory>${project.build.directory}/tools</installDirectory>
- <workingDirectory>${project.build.directory}/vue-source</workingDirectory>
+ <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</configuration>
- <executions>
- <execution>
- <id>install-node-and-npm</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <nodeVersion>v11.5.0</nodeVersion>
- <npmVersion>6.4.1</npmVersion>
- </configuration>
- </execution>
- <!-- Install all project dependencies -->
- <execution>
- <id>npm install</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <!-- optional: default phase is "generate-resources" -->
- <phase>package</phase>
- <!-- Optional configuration which provides for running any npm command -->
- <configuration>
- <arguments>install</arguments>
- </configuration>
- </execution>
- <!-- Build and minify static files -->
- <execution>
- <id>npm run build</id>
- <phase>package</phase>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>run build</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Copy master documents-->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-master-docs-to-docs</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
<configuration>
- <!-- mono-module doesn't require site:stage -->
- <content>${project.build.directory}/vue-source/src/.vuepress/dist</content>
- <!-- branch where to deploy -->
- <scmBranch>asf-site</scmBranch>
+ <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/../docs</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.simplify4u.plugins</groupId>
- <artifactId>sitemapxml-maven-plugin</artifactId>
+ </execution>
+ <execution>
+ <id>copy-other-md-files-to-development</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
<configuration>
- <siteOutputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist</siteOutputDirectory>
- <maxDepth>5</maxDepth>
+ <outputDirectory>${project.build.directory}/vue-source/src/Development</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/../tsfile</directory>
+ <includes>
+ <include>format-changelist.md</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../service-rpc</directory>
+ <includes>
+ <include>rpc-changelist.md</include>
+ </includes>
+ </resource>
+ </resources>
</configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>gen</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </execution>
+ <execution>
+ <id>copy-other-md-files-to-zh-development</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/vue-source/src/zh/Development</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/../tsfile</directory>
+ <includes>
+ <include>format-changelist.md</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../service-rpc</directory>
+ <includes>
+ <include>rpc-changelist.md</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- mv UserGuide of master into master folder -->
+ <plugin>
+ <groupId>com.coderplus.maven.plugins</groupId>
+ <artifactId>copy-rename-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>copy-package-json</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <fileSets>
+ <fileSet>
+ <sourceFile>${basedir}/src/main/package.json</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/package.json</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile>${basedir}/src/main/deploy.js</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/deploy.js</destinationFile>
+ </fileSet>
+ </fileSets>
+ </configuration>
+ </execution>
+ <execution>
+ <id>mv-master-userguide-to-tmp-folder</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>${project.build.directory}/vue-source/src/UserGuide</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/src/tmpUserGuide/master</destinationFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>mv-master-zh-userguide-to-tmp-folder</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>${project.build.directory}/vue-source/src/zh/UserGuide</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide/master</destinationFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- download lagecy docs from iotdb repo -->
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.3.0</version>
+ <executions>
+ <execution>
+ <id>get-0.9-docs</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>https://github.com/apache/incubator-iotdb/archive/rel/0.9.zip</url>
+ <outputDirectory>${project.build.directory}/download</outputDirectory>
+ <outputFileName>0.9.x.zip</outputFileName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>get-0.8-docs</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>https://github.com/apache/incubator-iotdb/archive/rel/0.8.zip</url>
+ <outputDirectory>${project.build.directory}/download</outputDirectory>
+ <outputFileName>0.8.x.zip</outputFileName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- unpack lagecy docs from the zip files-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>truezip-maven-plugin</artifactId>
+ <version>1.2</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>copy-0.9-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+ <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/UserGuide</directory>
+ <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.9.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-0.9-zh-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+ <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/zh/UserGuide</directory>
+ <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.9.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-0.8-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+ <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/UserGuide</directory>
+ <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.8.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-0.8-zh-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+ <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/zh/UserGuide</directory>
+ <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.8.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- mv UserGuide of master back -->
+ <plugin>
+ <groupId>com.coderplus.maven.plugins</groupId>
+ <artifactId>copy-rename-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>mv-master-userguide-to-docs</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>${project.build.directory}/vue-source/src/tmpUserGuide</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/src/UserGuide</destinationFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>mv-master-zh-userguide-to-docs</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/src/zh/UserGuide</destinationFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!--install node and npm， then run `npm install` and `npm run build`-->
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.9.1</version>
+ <configuration>
+ <installDirectory>${project.build.directory}/tools</installDirectory>
+ <workingDirectory>${project.build.directory}/vue-source</workingDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>install-node-and-npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <nodeVersion>v11.5.0</nodeVersion>
+ <npmVersion>6.4.1</npmVersion>
+ </configuration>
+ </execution>
+ <!-- Install all project dependencies -->
+ <execution>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <!-- optional: default phase is "generate-resources" -->
+ <phase>package</phase>
+ <!-- Optional configuration which provides for running any npm command -->
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
+ <!-- Build and minify static files -->
+ <execution>
+ <id>npm run build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>run build</arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <!-- mono-module doesn't require site:stage -->
+ <content>${project.build.directory}/vue-source/src/.vuepress/dist</content>
+ <!-- branch where to deploy -->
+ <scmBranch>asf-site</scmBranch>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.simplify4u.plugins</groupId>
+ <artifactId>sitemapxml-maven-plugin</artifactId>
+ <configuration>
+ <siteOutputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist</siteOutputDirectory>
+ <maxDepth>5</maxDepth>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>gen</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
[incubator-iotdb] 07/09: use travis official openjkd11 in LinuxOS
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit ff177c9ac3fcb0b786be9c2462ce70de543c215a
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Apr 6 10:06:30 2020 +0800
use travis official openjkd11 in LinuxOS
---
.travis.yml | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 112abb2..f9bc3c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,14 +58,8 @@ matrix:
name: linux-openjdk11
dist: xenial
sudo: required
- before_install:
- - wget https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O jdk11.tar.gz
- - tar -xzf jdk11.tar.gz
- before_script:
- - mv jdk-11.0.2 downloadJDK
- - rm -rf jdk11.tar.gz
- - export JAVA_HOME=$PWD/jdk-11.0.2/
- - export PATH=$JAVA_HOME/bin:$PATH
+ jdk:
+ - openjdk11
- os: linux
name: linux-openjdk8
dist: xenial
[incubator-iotdb] 03/09: re-organize coveralls test
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit cc7cbb7042f42b25b951bfff710405eedb6ff324
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Apr 5 11:08:49 2020 +0800
re-organize coveralls test
---
.travis.yml | 5 +++--
pom.xml | 15 +--------------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 129ab83..80eb436 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -139,8 +139,9 @@ matrix:
jdk: openjdk8
script:
# now, grafana has no tests; spark-* tests are written by scala
- - mvn post-integration-test -Pcode-coverage -pl '!distribution' -am
- - mvn coveralls:report -Dservice_name=travis_ci -pl '!grafana','!spark-iotdb-connector','!spark-tsfile','!distribution','!site'
+ - mvn post-integration-test -Pcode-coverage -Pcoveralls
+ - mvn coveralls:report -Dservice_name=travis_ci -pl '!grafana','!spark-iotdb-connector','!spark-tsfile','!distribution','!site' -am
+ #- mvn coveralls:report -Dservice_name=travis_ci -Pcoveralls
- os: linux
name: website checker
dist: xenial
diff --git a/pom.xml b/pom.xml
index bbf972d..1c4c80a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1211,19 +1211,6 @@
</profile>
<!-- upload code coverage report to coveralls.io-->
<!-- to enable coveralls locally, you need to get the repoToken from https://coveralls.io/github/apache/incubator-iotdb.
- use `mvn post-integration-test -pl hadoop -Pcode-coverage -Pcoveralls -DrepoToken=TOKEN`-->
- <profile>
- <id>coveralls</id>
- <modules>
- <!-- make sure the modules are synced with profile code-coverage-->
- <module>tsfile</module>
- <module>client</module>
- <module>session</module>
- <module>server</module>
- <module>jdbc</module>
- <module>hadoop</module>
- <module>hive-connector</module>
- </modules>
- </profile>
+ use `mvn post-integration-test -Pcode-coverage -DrepoToken=TOKEN`-->
</profiles>
</project>