You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/11/05 06:26:45 UTC
[01/10] incubator-kylin git commit: KYLIN-999 fix for google fonts
license
Repository: incubator-kylin
Updated Branches:
refs/heads/master 9c9fdfa95 -> 5723fb6b7
KYLIN-999 fix for google fonts license
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/a2fa3e8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/a2fa3e8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/a2fa3e8e
Branch: refs/heads/master
Commit: a2fa3e8e93765bf3db39f5da935aca3a588789f1
Parents: bac74fb
Author: Luke Han <lu...@apache.org>
Authored: Wed Nov 4 10:16:23 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Wed Nov 4 10:39:31 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 +
atopcalcite/pom.xml | 2 +-
common/pom.xml | 2 +-
cube/pom.xml | 2 +-
dictionary/pom.xml | 2 +-
invertedindex/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
job/pom.xml | 2 +-
metadata/pom.xml | 2 +-
monitor/pom.xml | 2 +-
pom.xml | 2 +-
query/pom.xml | 2 +-
server/pom.xml | 2 +-
storage/pom.xml | 2 +-
webapp/app/css/AdminLTE-fonts.css | 23 -------------------
webapp/app/css/AdminLTE.css | 4 ++--
...1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 | Bin 11400 -> 0 bytes
...t5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2 | Bin 11044 -> 0 bytes
18 files changed, 16 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index b016aa2..9a27b8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ tmp/
*.bak
*.swp
*~.nib
+*.versionsBackup
local.properties
release.properties
.loadpath
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/atopcalcite/pom.xml
----------------------------------------------------------------------
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index 0f99a3d..3e054ff 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 23543b8..4481dbc 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/cube/pom.xml
----------------------------------------------------------------------
diff --git a/cube/pom.xml b/cube/pom.xml
index 97b9fa8..e5964c4 100644
--- a/cube/pom.xml
+++ b/cube/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/dictionary/pom.xml
----------------------------------------------------------------------
diff --git a/dictionary/pom.xml b/dictionary/pom.xml
index 763b918..0d51a1e 100644
--- a/dictionary/pom.xml
+++ b/dictionary/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/invertedindex/pom.xml
----------------------------------------------------------------------
diff --git a/invertedindex/pom.xml b/invertedindex/pom.xml
index 8ff69f0..9e8fe9a 100644
--- a/invertedindex/pom.xml
+++ b/invertedindex/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-invertedindex</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 7ca71db..f80501d 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/job/pom.xml
----------------------------------------------------------------------
diff --git a/job/pom.xml b/job/pom.xml
index ae2e083..8b35206 100644
--- a/job/pom.xml
+++ b/job/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>kylin-job</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/metadata/pom.xml
----------------------------------------------------------------------
diff --git a/metadata/pom.xml b/metadata/pom.xml
index 477efb8..52feb4b 100644
--- a/metadata/pom.xml
+++ b/metadata/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/monitor/pom.xml b/monitor/pom.xml
index e359fa0..5f81f7b 100644
--- a/monitor/pom.xml
+++ b/monitor/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a54d34c..a6f2a2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
<packaging>pom</packaging>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
<name>Kylin:HadoopOLAPEngine</name>
<url>http://kylin.incubator.apache.org</url>
<inceptionYear>2014</inceptionYear>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/query/pom.xml
----------------------------------------------------------------------
diff --git a/query/pom.xml b/query/pom.xml
index f76b6fb..e9df781 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index b8b3333..3b6b2a5 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/storage/pom.xml
----------------------------------------------------------------------
diff --git a/storage/pom.xml b/storage/pom.xml
index 19dc5de..f7dc9f7 100644
--- a/storage/pom.xml
+++ b/storage/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1-incubating</version>
+ <version>1.1.1-incubating-SNAPSHOT</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/webapp/app/css/AdminLTE-fonts.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/AdminLTE-fonts.css b/webapp/app/css/AdminLTE-fonts.css
deleted file mode 100644
index a8e0244..0000000
--- a/webapp/app/css/AdminLTE-fonts.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/*!
- * AdminLTE v1.2
- * Author: AlmsaeedStudio.com
- * License: Open source - MIT
- * Please visit http://opensource.org/licenses/MIT for more information
-!*/
-
-/* latin */
-@font-face {
- font-family: 'Source Sans Pro';
- font-style: normal;
- font-weight: 400;
- src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(../fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
-/* latin */
-@font-face {
- font-family: 'Source Sans Pro';
- font-style: normal;
- font-weight: 700;
- src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(../fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/webapp/app/css/AdminLTE.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/AdminLTE.css b/webapp/app/css/AdminLTE.css
index e91795e..d86593d 100644
--- a/webapp/app/css/AdminLTE.css
+++ b/webapp/app/css/AdminLTE.css
@@ -21,7 +21,7 @@ body {
body {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
- font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-weight: 400;
overflow-x: hidden;
overflow-y: auto;
@@ -151,7 +151,7 @@ h6,
.h4,
.h5,
.h6 {
- font-family: 'Source Sans Pro', sans-serif;
+ font-family: sans-serif;
}
/* General Links */
a {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2
----------------------------------------------------------------------
diff --git a/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 b/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2
deleted file mode 100644
index da49c62..0000000
Binary files a/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a2fa3e8e/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2
----------------------------------------------------------------------
diff --git a/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2 b/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2
deleted file mode 100644
index 2486c1d..0000000
Binary files a/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2 and /dev/null differ
[07/10] incubator-kylin git commit: update pom.xml with rat exclude
Posted by sh...@apache.org.
update pom.xml with rat exclude
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/8d1deac1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/8d1deac1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/8d1deac1
Branch: refs/heads/master
Commit: 8d1deac1b60110e5c31e46ac8293aabc821bba8b
Parents: 6ef797b
Author: shaofengshi <sh...@apache.org>
Authored: Wed Nov 4 15:58:26 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed Nov 4 15:58:26 2015 +0800
----------------------------------------------------------------------
pom.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/8d1deac1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c4a8371..d0aed9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -794,6 +794,12 @@
<!-- MIT license -->
<exclude>webapp/app/css/AdminLTE.css</exclude>
+
+ <!--configuration file -->
+ <exclude>webapp/app/routes.json</exclude>
+ <exclude>webapp/bower.json</exclude>
+ <exclude>webapp/grunt.json</exclude>
+ <exclude>webapp/package.json</exclude>
<!-- jdbc log -->
<exclude>jdbc/kylin_jdbc.log*</exclude>
@@ -846,7 +852,6 @@
<appendAssemblyId>true</appendAssemblyId>
<descriptor>src/main/config/assemblies/source-assembly.xml</descriptor>
<finalName>apache-kylin-${project.version}</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
[02/10] incubator-kylin git commit: KYLIN-999 fix for google fonts
license and cleanup files
Posted by sh...@apache.org.
KYLIN-999 fix for google fonts license and cleanup files
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/14552192
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/14552192
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/14552192
Branch: refs/heads/master
Commit: 145521921e21057e9fdfe562ae102d7a3243d0f5
Parents: a2fa3e8
Author: Luke Han <lu...@apache.org>
Authored: Wed Nov 4 10:16:23 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Wed Nov 4 10:56:02 2015 +0800
----------------------------------------------------------------------
webapp/app/.gitignore | 0
webapp/app/css/AdminLTE.css | 1 -
webapp/app/image/Himg.png | Bin 913426 -> 0 bytes
webapp/app/image/cube1.png | Bin 24538 -> 0 bytes
webapp/app/image/forkme_right_red.png | Bin 7927 -> 0 bytes
5 files changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/14552192/webapp/app/.gitignore
----------------------------------------------------------------------
diff --git a/webapp/app/.gitignore b/webapp/app/.gitignore
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/14552192/webapp/app/css/AdminLTE.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/AdminLTE.css b/webapp/app/css/AdminLTE.css
index d86593d..f42878d 100644
--- a/webapp/app/css/AdminLTE.css
+++ b/webapp/app/css/AdminLTE.css
@@ -1,4 +1,3 @@
-@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);
/*!
* AdminLTE v2.1.0
* Author: Almsaeed Studio
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/14552192/webapp/app/image/Himg.png
----------------------------------------------------------------------
diff --git a/webapp/app/image/Himg.png b/webapp/app/image/Himg.png
deleted file mode 100644
index 9b34a77..0000000
Binary files a/webapp/app/image/Himg.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/14552192/webapp/app/image/cube1.png
----------------------------------------------------------------------
diff --git a/webapp/app/image/cube1.png b/webapp/app/image/cube1.png
deleted file mode 100644
index 1950764..0000000
Binary files a/webapp/app/image/cube1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/14552192/webapp/app/image/forkme_right_red.png
----------------------------------------------------------------------
diff --git a/webapp/app/image/forkme_right_red.png b/webapp/app/image/forkme_right_red.png
deleted file mode 100644
index 1e19c21..0000000
Binary files a/webapp/app/image/forkme_right_red.png and /dev/null differ
[10/10] incubator-kylin git commit: Merge tag 'kylin-1.1.1-incubating'
Posted by sh...@apache.org.
Merge tag 'kylin-1.1.1-incubating'
[maven-release-plugin] copy for tag kylin-1.1.1-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/5723fb6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/5723fb6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/5723fb6b
Branch: refs/heads/master
Commit: 5723fb6b7702d00023291ecb6f07388b974af8d2
Parents: 9c9fdfa 6a9499b
Author: shaofengshi <sh...@apache.org>
Authored: Thu Nov 5 13:25:10 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 13:25:10 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 +
atopcalcite/pom.xml | 2 +-
common/pom.xml | 2 +-
cube/pom.xml | 2 +-
dictionary/pom.xml | 2 +-
.../sandbox/capacity-scheduler.xml | 17 +-
examples/test_case_data/sandbox/core-site.xml | 17 +-
.../test_case_data/sandbox/hadoop-policy.xml | 17 +-
.../test_case_data/sandbox/hbase-policy.xml | 17 +-
examples/test_case_data/sandbox/hbase-site.xml | 17 +-
examples/test_case_data/sandbox/hdfs-site.xml | 17 +-
examples/test_case_data/sandbox/hive-site.xml | 17 +-
examples/test_case_data/sandbox/mapred-site.xml | 17 +-
examples/test_case_data/sandbox/yarn-site.xml | 17 +-
invertedindex/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
job/pom.xml | 2 +-
metadata/pom.xml | 2 +-
monitor/pom.xml | 23 +-
pom.xml | 211 ++++++++++---------
query/pom.xml | 2 +-
server/pom.xml | 2 +-
src/main/config/assemblies/source-assembly.xml | 9 +-
storage/pom.xml | 2 +-
webapp/app/.gitignore | 0
webapp/app/css/AdminLTE-fonts.css | 23 --
webapp/app/css/AdminLTE.css | 5 +-
...1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 | Bin 11400 -> 0 bytes
...t5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2 | Bin 11044 -> 0 bytes
webapp/app/image/Himg.png | Bin 913426 -> 0 bytes
webapp/app/image/cube1.png | Bin 24538 -> 0 bytes
webapp/app/image/forkme_right_red.png | Bin 7927 -> 0 bytes
webapp/app/index.html | 1 -
webapp/grunt.json | 1 -
34 files changed, 275 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
[08/10] incubator-kylin git commit: remove duplicated dependencies
from pom.xml and monitor/pom.xml
Posted by sh...@apache.org.
remove duplicated dependencies from pom.xml and monitor/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/708ea38d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/708ea38d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/708ea38d
Branch: refs/heads/master
Commit: 708ea38d7f764048e67e8e1ee8a13955983d12ba
Parents: 8d1deac
Author: shaofengshi <sh...@apache.org>
Authored: Wed Nov 4 17:00:17 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed Nov 4 17:00:17 2015 +0800
----------------------------------------------------------------------
monitor/pom.xml | 21 ---------------------
pom.xml | 7 +------
2 files changed, 1 insertion(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/708ea38d/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/monitor/pom.xml b/monitor/pom.xml
index 5f81f7b..3247562 100644
--- a/monitor/pom.xml
+++ b/monitor/pom.xml
@@ -67,27 +67,6 @@
<artifactId>hadoop-common</artifactId>
<scope>provided</scope>
</dependency>
- <!--hbase dependency-->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop2-compat</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <scope>provided</scope>
- </dependency>
<!--hbase dependency-->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/708ea38d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d0aed9b..b603bc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -544,12 +544,6 @@
<version>${maven-assembly.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.15</version>
- </plugin>
-
<!--
<plugin>
<groupId>com.mycila</groupId>
@@ -582,6 +576,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.15</version>
<executions>
<execution>
<id>validate</id>
[04/10] incubator-kylin git commit: update source-assembly.xml to add
zip format
Posted by sh...@apache.org.
update source-assembly.xml to add zip format
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/139b968a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/139b968a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/139b968a
Branch: refs/heads/master
Commit: 139b968af29675d3b82da0ea2c609525d19d0f26
Parents: d32d25d
Author: shaofengshi <sh...@apache.org>
Authored: Wed Nov 4 14:34:47 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed Nov 4 14:34:47 2015 +0800
----------------------------------------------------------------------
src/main/config/assemblies/source-assembly.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/139b968a/src/main/config/assemblies/source-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/config/assemblies/source-assembly.xml b/src/main/config/assemblies/source-assembly.xml
index 6f54721..9c28851 100644
--- a/src/main/config/assemblies/source-assembly.xml
+++ b/src/main/config/assemblies/source-assembly.xml
@@ -18,6 +18,7 @@ limitations under the License.
<assembly>
<id>src</id>
<formats>
+ <format>zip</format>
<format>tar.gz</format>
</formats>
@@ -25,7 +26,7 @@ limitations under the License.
<!-- main project directory structure -->
<fileSet>
<directory>.</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>.</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<!-- build output -->
@@ -103,14 +104,14 @@ limitations under the License.
<fileSet>
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF
</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
<include>git.properties</include>
</includes>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
[09/10] incubator-kylin git commit: [maven-release-plugin] prepare
release kylin-1.1.1-incubating
Posted by sh...@apache.org.
[maven-release-plugin] prepare release kylin-1.1.1-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/6a9499b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/6a9499b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/6a9499b4
Branch: refs/heads/master
Commit: 6a9499b4d0fabb54211a8a536c2e18d3fe8b4a5d
Parents: 708ea38
Author: shaofengshi <sh...@apache.org>
Authored: Wed Nov 4 17:52:37 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed Nov 4 17:52:37 2015 +0800
----------------------------------------------------------------------
atopcalcite/pom.xml | 2 +-
common/pom.xml | 2 +-
cube/pom.xml | 2 +-
dictionary/pom.xml | 2 +-
invertedindex/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
job/pom.xml | 2 +-
metadata/pom.xml | 2 +-
monitor/pom.xml | 2 +-
pom.xml | 4 ++--
query/pom.xml | 2 +-
server/pom.xml | 2 +-
storage/pom.xml | 2 +-
13 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/atopcalcite/pom.xml
----------------------------------------------------------------------
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index 3e054ff..7495271 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 4481dbc..1ac610c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/cube/pom.xml
----------------------------------------------------------------------
diff --git a/cube/pom.xml b/cube/pom.xml
index e5964c4..4d4e04d 100644
--- a/cube/pom.xml
+++ b/cube/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/dictionary/pom.xml
----------------------------------------------------------------------
diff --git a/dictionary/pom.xml b/dictionary/pom.xml
index 0d51a1e..6e83d15 100644
--- a/dictionary/pom.xml
+++ b/dictionary/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/invertedindex/pom.xml
----------------------------------------------------------------------
diff --git a/invertedindex/pom.xml b/invertedindex/pom.xml
index 9e8fe9a..e0900db 100644
--- a/invertedindex/pom.xml
+++ b/invertedindex/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-invertedindex</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index f80501d..c8f117b 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/job/pom.xml
----------------------------------------------------------------------
diff --git a/job/pom.xml b/job/pom.xml
index 8b35206..abb7c2a 100644
--- a/job/pom.xml
+++ b/job/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<artifactId>kylin-job</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/metadata/pom.xml
----------------------------------------------------------------------
diff --git a/metadata/pom.xml b/metadata/pom.xml
index 52feb4b..4decc8a 100644
--- a/metadata/pom.xml
+++ b/metadata/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/monitor/pom.xml b/monitor/pom.xml
index 3247562..a6da8b8 100644
--- a/monitor/pom.xml
+++ b/monitor/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b603bc5..cffd382 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
<packaging>pom</packaging>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
<name>Kylin:HadoopOLAPEngine</name>
<url>http://kylin.incubator.apache.org</url>
<inceptionYear>2014</inceptionYear>
@@ -141,7 +141,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-kylin.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-kylin.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/incubator-kylin.git</url>
- <tag>kylin-1.1-incubating</tag>
+ <tag>kylin-1.1.1-incubating</tag>
</scm>
<dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/query/pom.xml
----------------------------------------------------------------------
diff --git a/query/pom.xml b/query/pom.xml
index e9df781..e6d917a 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 3b6b2a5..722d951 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6a9499b4/storage/pom.xml
----------------------------------------------------------------------
diff --git a/storage/pom.xml b/storage/pom.xml
index f7dc9f7..dca1a46 100644
--- a/storage/pom.xml
+++ b/storage/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>1.1.1-incubating-SNAPSHOT</version>
+ <version>1.1.1-incubating</version>
</parent>
<dependencies>
[03/10] incubator-kylin git commit: KYLIN-999 remove ref to
Admin-fonts
Posted by sh...@apache.org.
KYLIN-999 remove ref to Admin-fonts
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/d32d25d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/d32d25d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/d32d25d7
Branch: refs/heads/master
Commit: d32d25d7e9e540337e56538ecae30b036452f561
Parents: 1455219
Author: jiazhong <ji...@ebay.com>
Authored: Wed Nov 4 11:36:47 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Wed Nov 4 11:36:47 2015 +0800
----------------------------------------------------------------------
pom.xml | 1 -
webapp/app/index.html | 1 -
webapp/grunt.json | 1 -
3 files changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d32d25d7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a6f2a2e..e5f73a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -655,7 +655,6 @@
<exclude>dictionary/metastore_db/**</exclude>
<!-- MIT license -->
- <exclude>webapp/app/css/AdminLTE-fonts.css</exclude>
<exclude>webapp/app/css/AdminLTE.css</exclude>
<!-- jdbc log -->
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d32d25d7/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
index f1087ed..1382df1 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -30,7 +30,6 @@
<!-- ref:css css/styles.min.<%= buildNumber %>.css -->
<link rel="stylesheet" type="text/css" href="components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="components/font-awesome/css/font-awesome.css">
- <link rel="stylesheet" type="text/css" href="css/AdminLTE-fonts.css">
<link rel="stylesheet" type="text/css" href="components/ng-grid/ng-grid.css">
<link rel="stylesheet" type="text/css" href="components/angular-tree-control/css/tree-control.css">
<link rel="stylesheet" type="text/css" href="components/angular-tree-control/css/tree-control-attribute.css">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d32d25d7/webapp/grunt.json
----------------------------------------------------------------------
diff --git a/webapp/grunt.json b/webapp/grunt.json
index fa272c9..a9b072d 100755
--- a/webapp/grunt.json
+++ b/webapp/grunt.json
@@ -49,7 +49,6 @@
"src": [
"app/components/bootstrap/dist/css/bootstrap.min.css",
"app/components/font-awesome/css/font-awesome.min.css",
- "app/css/AdminLTE-fonts.css",
"app/components/ng-grid/ng-grid.css",
"app/components/angular-tree-control/css/tree-control.css",
"app/components/angular-tree-control/css/tree-control-attribute.css",
[05/10] incubator-kylin git commit: KYLIN-999 Add apache license
header to hadoop conf files
Posted by sh...@apache.org.
KYLIN-999 Add apache license header to hadoop conf files
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/1b18325b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/1b18325b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/1b18325b
Branch: refs/heads/master
Commit: 1b18325b5e99346dc5e16060e4f5bb5d4d81d491
Parents: 139b968
Author: Li, Yang <ya...@ebay.com>
Authored: Wed Nov 4 14:57:21 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Wed Nov 4 14:57:21 2015 +0800
----------------------------------------------------------------------
.../test_case_data/sandbox/capacity-scheduler.xml | 17 ++++++++++++++++-
examples/test_case_data/sandbox/core-site.xml | 17 ++++++++++++++++-
examples/test_case_data/sandbox/hadoop-policy.xml | 17 ++++++++++++++++-
examples/test_case_data/sandbox/hbase-policy.xml | 17 ++++++++++++++++-
examples/test_case_data/sandbox/hbase-site.xml | 17 ++++++++++++++++-
examples/test_case_data/sandbox/hdfs-site.xml | 17 ++++++++++++++++-
examples/test_case_data/sandbox/hive-site.xml | 17 ++++++++++++++++-
examples/test_case_data/sandbox/mapred-site.xml | 17 ++++++++++++++++-
examples/test_case_data/sandbox/yarn-site.xml | 17 ++++++++++++++++-
9 files changed, 144 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1b18325b/examples/test_case_data/sandbox/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/capacity-scheduler.xml b/examples/test_case_data/sandbox/capacity-scheduler.xml
index dcd63c1..7cb985c 100644
--- a/examples/test_case_data/sandbox/capacity-scheduler.xml
+++ b/examples/test_case_data/sandbox/capacity-scheduler.xml
@@ -1,4 +1,19 @@
-<!--Wed May 27 08:09:06 2015-->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<configuration>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1b18325b/examples/test_case_data/sandbox/core-site.xml
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/core-site.xml b/examples/test_case_data/sandbox/core-site.xml
index 0a80866..9aa588c 100644
--- a/examples/test_case_data/sandbox/core-site.xml
+++ b/examples/test_case_data/sandbox/core-site.xml
@@ -1,4 +1,19 @@
-<!--Wed May 27 08:08:58 2015-->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<configuration>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1b18325b/examples/test_case_data/sandbox/hadoop-policy.xml
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/hadoop-policy.xml b/examples/test_case_data/sandbox/hadoop-policy.xml
index 4556120..a590979 100644
--- a/examples/test_case_data/sandbox/hadoop-policy.xml
+++ b/examples/test_case_data/sandbox/hadoop-policy.xml
@@ -1,4 +1,19 @@
-<!--Fri Apr 24 12:58:40 2015-->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<configuration>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1b18325b/examples/test_case_data/sandbox/hbase-policy.xml
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/hbase-policy.xml b/examples/test_case_data/sandbox/hbase-policy.xml
index ae974bb..178b559 100644
--- a/examples/test_case_data/sandbox/hbase-policy.xml
+++ b/examples/test_case_data/sandbox/hbase-policy.xml
@@ -1,4 +1,19 @@
-<!--Wed May 27 06:14:03 2015-->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<configuration>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1b18325b/examples/test_case_data/sandbox/hbase-site.xml
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/hbase-site.xml b/examples/test_case_data/sandbox/hbase-site.xml
index 06755a8..734908e 100644
--- a/examples/test_case_data/sandbox/hbase-site.xml
+++ b/examples/test_case_data/sandbox/hbase-site.xml
@@ -1,4 +1,19 @@
-<!--Wed May 27 06:14:00 2015-->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<configuration>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1b18325b/examples/test_case_data/sandbox/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/hdfs-site.xml b/examples/test_case_data/sandbox/hdfs-site.xml
index db4da75..1175fff 100644
--- a/examples/test_case_data/sandbox/hdfs-site.xml
+++ b/examples/test_case_data/sandbox/hdfs-site.xml
@@ -1,4 +1,19 @@
-<!--Wed May 27 06:14:02 2015-->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<configuration>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1b18325b/examples/test_case_data/sandbox/hive-site.xml
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/hive-site.xml b/examples/test_case_data/sandbox/hive-site.xml
index 21fc81a..f4c7738 100644
--- a/examples/test_case_data/sandbox/hive-site.xml
+++ b/examples/test_case_data/sandbox/hive-site.xml
@@ -1,4 +1,19 @@
-<!--Fri Apr 24 13:44:42 2015-->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<configuration>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1b18325b/examples/test_case_data/sandbox/mapred-site.xml
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/mapred-site.xml b/examples/test_case_data/sandbox/mapred-site.xml
index f2b49c5..a8ff87f 100644
--- a/examples/test_case_data/sandbox/mapred-site.xml
+++ b/examples/test_case_data/sandbox/mapred-site.xml
@@ -1,4 +1,19 @@
-<!--Wed May 27 08:09:05 2015-->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<configuration>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1b18325b/examples/test_case_data/sandbox/yarn-site.xml
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/yarn-site.xml b/examples/test_case_data/sandbox/yarn-site.xml
index a8cda86..8256158 100644
--- a/examples/test_case_data/sandbox/yarn-site.xml
+++ b/examples/test_case_data/sandbox/yarn-site.xml
@@ -1,4 +1,19 @@
-<!--Wed May 27 08:09:01 2015-->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<configuration>
<property>
[06/10] incubator-kylin git commit: KYLIN-999 update rat rule in pom
Posted by sh...@apache.org.
KYLIN-999 update rat rule in pom
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/6ef797b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/6ef797b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/6ef797b6
Branch: refs/heads/master
Commit: 6ef797b68925db650b1c1878a104211d5b29fe18
Parents: 1b18325
Author: Luke Han <lu...@apache.org>
Authored: Wed Nov 4 15:09:42 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Wed Nov 4 15:12:47 2015 +0800
----------------------------------------------------------------------
pom.xml | 194 ++++++++++----------
src/main/config/assemblies/source-assembly.xml | 2 +
2 files changed, 104 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6ef797b6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e5f73a0..c4a8371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -602,97 +602,6 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <!-- Apache-RAT checks for files without headers.
- If run on a messy developer's sandbox, it will fail.
- This serves as a reminder to only build a release in a clean
- sandbox! -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <numUnapprovedLicenses>0</numUnapprovedLicenses>
- <excludes>
- <exclude>DEPENDENCIES</exclude>
- <exclude>.idea/**</exclude>
- <exclude>.git/**</exclude>
- <exclude>.settings/**</exclude>
- <!-- text files without comments -->
- <exclude>**/*.csv</exclude>
- <exclude>**/*.json</exclude>
- <exclude>**/*.md</exclude>
- <!-- binary files -->
- <exclude>**/*.dict</exclude>
- <exclude>**/*.dic</exclude>
- <exclude>**/*.snapshot</exclude>
- <exclude>**/*.pdf</exclude>
- <exclude>**/*.log</exclude>
- <exclude>dist/**</exclude>
- <exclude>server/logs**</exclude>
-
- <exclude>**/.checkstyle</exclude>
- <!--Job's Test Data-->
- <exclude>**/src/test/resources/**</exclude>
-
- <!-- generated files -->
- <exclude>**/target/**</exclude>
- <exclude>lib/**</exclude>
- <!-- Kylin's website content -->
- <exclude>**/.sass-cache/**</exclude>
-
- <exclude>website/**</exclude>
-
- <!-- tomcat package -->
- <exclude>tomcat/**</exclude>
- <!-- front end libary and generated files -->
- <exclude>webapp/node_modules/**</exclude>
- <exclude>webapp/dist/**</exclude>
- <exclude>webapp/app/components/**</exclude>
- <!-- json configuration file-->
- <exclude>webapp/.bowerrc</exclude>
- <exclude>webapp/.jshintrc</exclude>
- <!-- generated dict files -->
- <exclude>dictionary/metastore_db/**</exclude>
-
- <!-- MIT license -->
- <exclude>webapp/app/css/AdminLTE.css</exclude>
-
- <!-- jdbc log -->
- <exclude>jdbc/kylin_jdbc.log*</exclude>
- <!-- server log -->
- <exclude>server/logs/**</exclude>
-
- <!-- HBase MiniCluster Testing Data, for testing only -->
- <exclude>examples/test_case_data/minicluster/hbase-export.tar.gz</exclude>
- <exclude>examples/test_case_data/**/*.xml</exclude>
-
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- <version>1.6</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </plugin>
-
-
- </plugins>
</build>
<modules>
@@ -820,8 +729,108 @@
</configuration>
</plugin>
+ <!-- Apache-RAT checks for files without headers.
+ If run on a messy developer's sandbox, it will fail.
+ This serves as a reminder to only build a release in a clean
+ sandbox! -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <numUnapprovedLicenses>0</numUnapprovedLicenses>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>README.*</exclude>
+ <exclude>**/LICENSE*</exclude>
+ <!-- Local git repo -->
+ <exclude>.git/**</exclude>
+ <!-- IDE files -->
+ <exclude>.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>.settings/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+
+ <!-- text files without comments -->
+ <exclude>**/*.csv</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.md</exclude>
+ <!-- binary files -->
+ <exclude>**/*.dict</exclude>
+ <exclude>**/*.dic</exclude>
+ <exclude>**/*.snapshot</exclude>
+ <exclude>**/*.log</exclude>
+
+ <!-- image files constitute images required for documentation. .pptx contain the sources for images -->
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.ico</exclude>
+
+ <exclude>server/logs**</exclude>
+
+ <exclude>**/.checkstyle</exclude>
+ <!--Job's Test Data-->
+ <exclude>**/src/test/resources/**</exclude>
+
+ <!-- generated files -->
+ <exclude>**/target/**</exclude>
+ <exclude>lib/**</exclude>
+ <exclude>dist/**</exclude>
+ <!-- Kylin's website content -->
+ <exclude>**/.sass-cache/**</exclude>
+
+ <exclude>website/**</exclude>
+
+ <!-- front end libary and generated files -->
+ <exclude>webapp/node_modules/**</exclude>
+ <exclude>webapp/dist/**</exclude>
+ <exclude>webapp/app/components/**</exclude>
+ <!-- json configuration file-->
+ <exclude>webapp/.bowerrc</exclude>
+ <exclude>webapp/.jshintrc</exclude>
+ <!-- generated dict files -->
+ <exclude>dictionary/metastore_db/**</exclude>
+
+ <!-- MIT license -->
+ <exclude>webapp/app/css/AdminLTE.css</exclude>
+
+ <!-- jdbc log -->
+ <exclude>jdbc/kylin_jdbc.log*</exclude>
+ <!-- server log -->
+ <exclude>server/logs/**</exclude>
+
+ <!-- HBase MiniCluster Testing Data, for testing only -->
+ <exclude>examples/test_case_data/minicluster/hbase-export.tar.gz</exclude>
+ <exclude>examples/test_case_data/**/*.xml</exclude>
+
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>1.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </plugin>
+
<!-- Override the parent assembly execution to customize the assembly
- descriptor and final name. -->
+ descriptor and final name. -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -837,6 +846,7 @@
<appendAssemblyId>true</appendAssemblyId>
<descriptor>src/main/config/assemblies/source-assembly.xml</descriptor>
<finalName>apache-kylin-${project.version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6ef797b6/src/main/config/assemblies/source-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/config/assemblies/source-assembly.xml b/src/main/config/assemblies/source-assembly.xml
index 9c28851..7844515 100644
--- a/src/main/config/assemblies/source-assembly.xml
+++ b/src/main/config/assemblies/source-assembly.xml
@@ -98,6 +98,8 @@ limitations under the License.
</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?lib(/.*)?]
</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?docs(/.*)?]
+ </exclude>
</excludes>
</fileSet>
<!-- LICENSE, NOTICE, DEPENDENCIES, git.properties, etc. calculated at build time -->