From 0fb83f10240bc4e71d148daa6992b52e73877f93 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoschek Date: Thu, 25 Aug 2016 18:07:02 -0700 Subject: [PATCH 1/6] KITE 452: Also allow building kite with java versions greater than $javaVersion --- .travis.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 921ff7a910..f8ecfeb664 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ cache: install: mvn -q install -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true -DjavaVersion=1.7 before_script: umask 0022 before_install: echo "127.0.0.1 "`hostname` | sudo tee -a /etc/hosts -script: mvn test -P $HADOOP_PROFILE -DjavaVersion=1.7 +script: mvn test -P $HADOOP_PROFILE notifications: webhooks: diff --git a/pom.xml b/pom.xml index 7e95ef1e55..493154a7f7 100644 --- a/pom.xml +++ b/pom.xml @@ -251,7 +251,7 @@ [3.0.0,) - [${javaVersion}.0,${javaVersion}.1000}] + [${javaVersion}.0,) From 345ad807e5a35cbcc7f0e965318b2826257faa9a Mon Sep 17 00:00:00 2001 From: Wolfgang Hoschek Date: Thu, 25 Aug 2016 18:09:30 -0700 Subject: [PATCH 2/6] KITE 452: Also allow building kite with java versions greater than $javaVersion, plus enable travis on Java8 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f8ecfeb664..11f9db5d2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: java jdk: - oraclejdk7 + - oraclejdk8 env: - HADOOP_PROFILE=default From 52a8051d86858399298b9bf58e7d4f2300db176a Mon Sep 17 00:00:00 2001 From: Wolfgang Hoschek Date: Thu, 25 Aug 2016 22:22:30 -0700 Subject: [PATCH 3/6] KITE-1126: Update morphlines to use Solr6 instead of Solr4: ensure test sets a well-defined locale --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 11f9db5d2d..db60b792d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ cache: install: mvn -q install -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true -DjavaVersion=1.7 before_script: umask 0022 before_install: echo "127.0.0.1 "`hostname` | sudo tee -a /etc/hosts -script: mvn test -P $HADOOP_PROFILE +script: mvn test -P $HADOOP_PROFILE -D tests.locale=en-US notifications: webhooks: From 62e5b9d0d670225be696581816357066482db478 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoschek Date: Thu, 25 Aug 2016 22:25:30 -0700 Subject: [PATCH 4/6] KITE 452: Also allow building kite with java versions greater than $javaVersion, plus enable travis on Java8 - part2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index db60b792d8..ee272e2cb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ cache: directories: - $HOME/.m2 -install: mvn -q install -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true -DjavaVersion=1.7 +install: mvn -q install -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true before_script: umask 0022 before_install: echo "127.0.0.1 "`hostname` | sudo tee -a /etc/hosts script: mvn test -P $HADOOP_PROFILE -D tests.locale=en-US From d957422ad5f5e700a6e3b862f431b60a1acaf6ec Mon Sep 17 00:00:00 2001 From: Wolfgang Hoschek Date: Thu, 25 Aug 2016 22:31:28 -0700 Subject: [PATCH 5/6] KITE 452: Also allow building kite with java versions greater than $javaVersion, plus enable travis on Java8 - part3 (docs) --- kite-morphlines/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kite-morphlines/README.md b/kite-morphlines/README.md index 32c47feeb9..8d5d0edd31 100644 --- a/kite-morphlines/README.md +++ b/kite-morphlines/README.md @@ -52,7 +52,7 @@ cd kite #git tag # list available releases #git checkout master #git checkout release-1.0.0 # or whatever the latest version is -mvn clean install -DskipTests -DjavaVersion=1.7 +mvn clean install -DskipTests cd kite-morphlines mvn clean package find kite-morphlines-core/target -name '*.jar' @@ -84,7 +84,7 @@ log4j.logger.org.kitesdk.morphline=TRACE ```bash cd kite -mvn eclipse:eclipse -DjavaVersion=1.7 +mvn eclipse:eclipse ``` * `mvn eclipse:eclipse` creates several Eclipse projects, one for each maven submodule. From da8530d0de11ba24ca8e90d44c46bbdefb6f7d83 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoschek Date: Thu, 25 Aug 2016 22:34:32 -0700 Subject: [PATCH 6/6] KITE-1126: Update morphlines to use Solr6 instead of Solr4: ensure test sets a well-defined US locale --- .travis.yml | 2 +- kite-morphlines/kite-morphlines-solr-cell/pom.xml | 2 +- kite-morphlines/kite-morphlines-solr-core/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee272e2cb3..0405538118 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ cache: install: mvn -q install -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true before_script: umask 0022 before_install: echo "127.0.0.1 "`hostname` | sudo tee -a /etc/hosts -script: mvn test -P $HADOOP_PROFILE -D tests.locale=en-US +script: mvn test -P $HADOOP_PROFILE notifications: webhooks: diff --git a/kite-morphlines/kite-morphlines-solr-cell/pom.xml b/kite-morphlines/kite-morphlines-solr-cell/pom.xml index 47c05fa3f9..bc98545bd8 100644 --- a/kite-morphlines/kite-morphlines-solr-cell/pom.xml +++ b/kite-morphlines/kite-morphlines-solr-cell/pom.xml @@ -115,7 +115,7 @@ org.apache.maven.plugins maven-surefire-plugin - -Dtests.locale=en_us + -Dtests.locale=en-US true diff --git a/kite-morphlines/kite-morphlines-solr-core/pom.xml b/kite-morphlines/kite-morphlines-solr-core/pom.xml index 651ab05888..2e54a63d04 100644 --- a/kite-morphlines/kite-morphlines-solr-core/pom.xml +++ b/kite-morphlines/kite-morphlines-solr-core/pom.xml @@ -91,7 +91,7 @@ org.apache.maven.plugins maven-surefire-plugin - -Dtests.locale=en_us + -Dtests.locale=en-US true