s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1368 from jackyq2015/jdk8

Browse Source 
remove jdk7
This commit is contained in:
Thad Guidry 2017-11-30 20:35:02 -06:00 committed by GitHub
commit 6ef8d270e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -80,12 +80,12 @@
<classpathentry kind="lib" path="main/webapp/WEB-INF/lib/poi-3.13-20150929.jar"/> <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/poi-3.13-20150929.jar"/>
<classpathentry kind="lib" path="main/webapp/WEB-INF/lib/poi-ooxml-3.13-20150929.jar"/> <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/poi-ooxml-3.13-20150929.jar"/>
<classpathentry kind="lib" path="main/webapp/WEB-INF/lib/poi-ooxml-schemas-3.13-20150929.jar"/> <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/poi-ooxml-schemas-3.13-20150929.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="extensions/jython/module/MOD-INF/lib/jython-standalone-2.7.1.jar"/> <classpathentry kind="lib" path="extensions/jython/module/MOD-INF/lib/jython-standalone-2.7.1.jar"/>
<classpathentry kind="lib" path="main/tests/data"/> <classpathentry kind="lib" path="main/tests/data"/>
<classpathentry kind="lib" path="main/webapp/WEB-INF/lib/swc-parser-lazy-3.1.5-jar-with-dependencies.jar" sourcepath="main/webapp/WEB-INF/lib-src/swc-parser-lazy-3.1.5-sources.jar"/> <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/swc-parser-lazy-3.1.5-jar-with-dependencies.jar" sourcepath="main/webapp/WEB-INF/lib-src/swc-parser-lazy-3.1.5-sources.jar"/>
<classpathentry kind="lib" path="main/webapp/WEB-INF/lib/jackson-annotations-2.9.1.jar"/> <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/jackson-annotations-2.9.1.jar"/>
<classpathentry kind="lib" path="main/webapp/WEB-INF/lib/jackson-core-2.9.1.jar"/> <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/jackson-core-2.9.1.jar"/>
<classpathentry kind="lib" path="main/webapp/WEB-INF/lib/jackson-databind-2.9.1.jar"/> <classpathentry kind="lib" path="main/webapp/WEB-INF/lib/jackson-databind-2.9.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="main/webapp/WEB-INF/classes"/> <classpathentry kind="output" path="main/webapp/WEB-INF/classes"/>
</classpath> </classpath>

1
.travis.yml
View File

@ -1,7 +1,6 @@
language: java language: java
jdk: jdk:
- oraclejdk8 - oraclejdk8
- openjdk7
env: env:
# encrypted Codacy key, see https://docs.travis-ci.com/user/encryption-keys/ # encrypted Codacy key, see https://docs.travis-ci.com/user/encryption-keys/

6
build.xml
View File

@ -18,7 +18,7 @@
<property name="build.dir" value="build"/> <property name="build.dir" value="build"/>
<property name="dist.dir" value="dist"/> <property name="dist.dir" value="dist"/>
<property name="java_version" value="1.7"/> <property name="java_version" value="1.8"/>
<property name="appengine.app_id" value="openrefine-broker"/> <property name="appengine.app_id" value="openrefine-broker"/>
<property name="appengine.version" value="1"/> <property name="appengine.version" value="1"/>
@ -320,7 +320,7 @@
<classPath mainClass="com.google.refine.Refine"> <classPath mainClass="com.google.refine.Refine">
<cp>server/lib/*.jar</cp> <cp>server/lib/*.jar</cp>
</classPath> </classPath>
<jre minVersion="1.6.0" jdkPreference="preferJre" initialHeapSize="256" maxHeapSize="1024"> <jre minVersion="1.8.0" jdkPreference="preferJre" initialHeapSize="256" maxHeapSize="1024">
<opt>-Djava.library.path=server/lib/native/windows </opt> <opt>-Djava.library.path=server/lib/native/windows </opt>
</jre> </jre>
<versionInfo <versionInfo
@ -441,7 +441,7 @@
classname="net.sourceforge.pmd.ant.PMDTask" classname="net.sourceforge.pmd.ant.PMDTask"
classpathref="pmd.path" classpathref="pmd.path"
/> />
<pmd rulesetfiles="${conf.dir}/pmd.rules.xml" targetjdk="1.6" encoding="UTF-8"> <pmd rulesetfiles="${conf.dir}/pmd.rules.xml" targetjdk="1.8" encoding="UTF-8">
<formatter type="html" toFile="${reports.dir}/pmd.html" toConsole="true"/> <formatter type="html" toFile="${reports.dir}/pmd.html" toConsole="true"/>
<fileset dir="${server.src.dir}"> <fileset dir="${server.src.dir}">
<include name="**/*.java"/> <include name="**/*.java"/>

2
refine.ini
View File

@ -15,7 +15,7 @@ REFINE_MIN_MEMORY=1400M
# Some sample configurations. These have no defaults. # Some sample configurations. These have no defaults.
#ANT_HOME=C:\grefine\tools\apache-ant-1.8.1 #ANT_HOME=C:\grefine\tools\apache-ant-1.8.1
#JAVA_HOME=C:\Program Files\Java\jdk1.6.0_25 #JAVA_HOME=C:\Program Files\Java\jdk1.8.0_151
#JAVA_OPTIONS=-XX:+UseParallelGC -verbose:gc -Drefine.headless=true #JAVA_OPTIONS=-XX:+UseParallelGC -verbose:gc -Drefine.headless=true
#JAVA_OPTIONS=-Drefine.data_dir=C:\Users\user\AppData\Roaming\OpenRefine #JAVA_OPTIONS=-Drefine.data_dir=C:\Users\user\AppData\Roaming\OpenRefine