From ad858d9f1947accf5e167a70b332a51e1f1d5246 Mon Sep 17 00:00:00 2001 From: William Guo Date: Thu, 20 Jul 2017 11:14:18 +0800 Subject: [PATCH 1/5] add ci --- .travis.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..80011161a --- /dev/null +++ b/.travis.yml @@ -0,0 +1,20 @@ +# 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. + +language: java scala +jdk: + - oraclejdk8 +scala: + - 2.10.6 + +script: mvn clean verify From 6b59bed8f095e80a48f588f0f04f23049bbda0c6 Mon Sep 17 00:00:00 2001 From: William Guo Date: Thu, 20 Jul 2017 12:52:45 +0800 Subject: [PATCH 2/5] add bower in ci --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 80011161a..73f9285c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,15 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. -language: java scala +language: java scala node_js + jdk: - oraclejdk8 scala: - 2.10.6 +node_js: + - "6" +before_script: + - 'npm install -g bower' script: mvn clean verify From a6ec7a21273ea3af7ac7075939e6b3f317f03580 Mon Sep 17 00:00:00 2001 From: William Guo Date: Thu, 20 Jul 2017 13:15:02 +0800 Subject: [PATCH 3/5] bower --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22b1b1dac..54661299b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ scala: node_js: - "6" -before_script: - - 'npm install -g bower' +install: + - npm install -g bower script: mvn clean verify From 9a2fe6b17bd815289bf8385a042355bfc0827e56 Mon Sep 17 00:00:00 2001 From: William Guo Date: Thu, 20 Jul 2017 14:39:14 +0800 Subject: [PATCH 4/5] fix logging level issue from Travis ci --- measure/src/test/resources/log4j.properties | 25 ------------------- .../resources/application-test.properties | 6 ++++- .../src/test/resources/application.properties | 8 +++++- 3 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 measure/src/test/resources/log4j.properties diff --git a/measure/src/test/resources/log4j.properties b/measure/src/test/resources/log4j.properties deleted file mode 100644 index ff9399bb2..000000000 --- a/measure/src/test/resources/log4j.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# 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. -# - - -log4j.rootLogger=INFO, stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%c] - %m%n \ No newline at end of file diff --git a/service/src/test/resources/application-test.properties b/service/src/test/resources/application-test.properties index 7d93f37b4..ea9d83d93 100644 --- a/service/src/test/resources/application-test.properties +++ b/service/src/test/resources/application-test.properties @@ -75,4 +75,8 @@ hive.metastore.uris = thrift://10.9.246.187:9083 hive.metastore.dbname = default # kafka schema registry -kafka.schema.registry.url = http://10.65.159.119:8081 \ No newline at end of file +kafka.schema.registry.url = http://10.65.159.119:8081 + +#logging level +logging.level.org.springframework=DEBUG +logging.level.org.hibernate=ERROR \ No newline at end of file diff --git a/service/src/test/resources/application.properties b/service/src/test/resources/application.properties index 1bdce71aa..755e44907 100644 --- a/service/src/test/resources/application.properties +++ b/service/src/test/resources/application.properties @@ -36,4 +36,10 @@ hive.metastore.uris = thrift://10.9.246.187:9083 hive.metastore.dbname = default # kafka schema registry -kafka.schema.registry.url = http://10.65.159.119:8081 \ No newline at end of file +kafka.schema.registry.url = http://10.65.159.119:8081 + +#logging level +logging.level.root=ERROR +logging.level.org.hibernate=ERROR +logging.level.org.springframework.test=ERROR +logging.file=target/test.log \ No newline at end of file From 2a69f4fde680c38e700de8d105386159c3e89703 Mon Sep 17 00:00:00 2001 From: William Guo Date: Thu, 20 Jul 2017 15:17:57 +0800 Subject: [PATCH 5/5] remove unused properties --- .travis.yml | 2 +- .../resources/application-test.properties | 82 ------------------- .../src/test/resources/application.properties | 1 + 3 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 service/src/test/resources/application-test.properties diff --git a/.travis.yml b/.travis.yml index 54661299b..143b665ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,4 @@ node_js: install: - npm install -g bower -script: mvn clean verify +script: mvn clean verify -q diff --git a/service/src/test/resources/application-test.properties b/service/src/test/resources/application-test.properties deleted file mode 100644 index ea9d83d93..000000000 --- a/service/src/test/resources/application-test.properties +++ /dev/null @@ -1,82 +0,0 @@ -# -# 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. -# - - -#spring.datasource.url= jdbc:mysql://localhost:3306/griffintest?autoReconnect=true&useSSL=false -#spring.datasource.username =root -#spring.datasource.password =cxr123 -# -#spring.datasource.driver-class-name=com.mysql.jdbc.Driver -# -### Hibernate ddl auto (validate,create, create-drop, update) -# -#spring.jpa.hibernate.ddl-auto = update -#spring.jpa.show-sql=true -#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect -# -##spring.jpa.hibernate.ddl-auto = create-drop -##spring.jpa.database = HSQL -##spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.HSQLDialect -##spring.datasource.driverClassName = org.hsqldb.jdbcDriver -##spring.datasource.url: jdbc:hsqldb:mem:scratchdb -##spring.datasource.username = sa -##spring.datasource.password = - -#spring.jpa.database: HSQL -# -## -## -### Naming strategy -#spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy -# -# hive metastore -#hive.metastore.uris = thrift://10.9.246.187:9083 -#hive.metastore.dbname = default -# -## kafka schema registry -#kafka.schema.registry.url = http://10.65.159.119:8081 - -key=test - -spring.datasource.url= jdbc:mysql://localhost:3306/quartz?autoReconnect=true&useSSL=false -spring.datasource.username =griffin -spring.datasource.password =123456 - -spring.datasource.driver-class-name=com.mysql.jdbc.Driver - -## Hibernate ddl auto (validate,create, create-drop, update) - -spring.jpa.hibernate.ddl-auto = update -spring.jpa.show-sql=true -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect -# -# -## Naming strategy -spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy - -# hive metastore -hive.metastore.uris = thrift://10.9.246.187:9083 -hive.metastore.dbname = default - -# kafka schema registry -kafka.schema.registry.url = http://10.65.159.119:8081 - -#logging level -logging.level.org.springframework=DEBUG -logging.level.org.hibernate=ERROR \ No newline at end of file diff --git a/service/src/test/resources/application.properties b/service/src/test/resources/application.properties index 755e44907..d6c785193 100644 --- a/service/src/test/resources/application.properties +++ b/service/src/test/resources/application.properties @@ -42,4 +42,5 @@ kafka.schema.registry.url = http://10.65.159.119:8081 logging.level.root=ERROR logging.level.org.hibernate=ERROR logging.level.org.springframework.test=ERROR +logging.level.org.apache.griffin=ERROR logging.file=target/test.log \ No newline at end of file