KITE 452: Also allow building kite with java versions greater than $j…

…avaVersion
kite-sdk · Aug 26, 2016 · cb07d02 · cb07d02
1 parent 4c7863c
commit cb07d02
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: java
 jdk:
   - oraclejdk7
+  - oraclejdk8
 
 env:
   - HADOOP_PROFILE=default
@@ -9,10 +10,10 @@ 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 -DjavaVersion=1.7
+script: mvn test -P $HADOOP_PROFILE
 
 notifications:
   webhooks:

diff --git 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.

diff --git a/pom.xml b/pom.xml
@@ -173,7 +173,7 @@
     <vers.typesafe.config>1.0.2</vers.typesafe.config>
     <vers.solr>6.2.0</vers.solr>
     <solr.expected.version>6.2.0</solr.expected.version> <!-- sanity check to verify we actually run against the expected version rather than some outdated version -->
-    <vers.solr-cdh5>4.10.3</vers.solr-cdh5>
+    <vers.solr-cdh5>6.2.0</vers.solr-cdh5>
     <vers.tika>1.13</vers.tika>
     <vers.jackson>2.3.1</vers.jackson>
     <vers.opencsv>2.3</vers.opencsv>
@@ -251,7 +251,7 @@
               <version>[3.0.0,)</version>
             </requireMavenVersion>
             <requireJavaVersion>
-              <version>[${javaVersion}.0,${javaVersion}.1000}]</version>
+              <version>[${javaVersion}.0,)</version>
             </requireJavaVersion>
           </rules>
         </configuration>