hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Travis CI now builds for Java 13 -- and fixed some issues for Java 13 (#572)

Browse Source 
* [jar][Upgrade] Upgrade lib-tests libraries

* [fix][jar/upgrade] Upgraded jars in core/lib.  -- fixed Junit Failures due to missing jaxb bindings.

* [fix] Added openjdk 13 to travis auto-builds

* [fix][unittest][java8] fixes automated java8 unittests

* [fix][build][jar] Upgraded logback libraries; moved to core/lib

* [fix][build][jar] removes unused jars: jaxb-jxc.*.jar

* [upgrade][build][jar] Upgrade the guice .jar libraries
This commit is contained in:
Daniel Williams 2020-03-06 08:52:20 -05:00 committed by GitHub
parent 3aaf8c6802
commit 84203b014b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 97 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -7,15 +7,14 @@ addons:
- ant-optional
jdk:
- openjdk8
- openjdk13
script:
- "ant -buildfile build.xml clean check jar unittest"
after_success:
- ls -lh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket.jar
- ls -lh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket-Core.jar
- wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
- bash upload.sh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket.jar
- bash upload.sh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket-Core.jar
branches:
except:

113
core/OpenRocket Core.iml
View File

@ -34,6 +34,25 @@
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="OpenRocket Test Libraries" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/annotation-detector-3.0.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="aopalliance.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/aopalliance.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="RXTXcomm.jar">
<CLASSES>
@ -53,45 +72,9 @@
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="opencsv-2.3.jar">
<library name="guice-4.2.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/opencsv-2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="guice-3.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/guice-3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="guice-multibindings-3.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/guice-multibindings-3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="javax.inject.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/javax.inject.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="aopalliance.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/aopalliance.jar!/" />
<root url="jar://$MODULE_DIR$/lib/guice-4.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@ -106,73 +89,39 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="lib-test" level="project" />
<orderEntry type="library" name="javax" level="project" />
<orderEntry type="module-library">
<library name="annotation-detector-3.0.2.jar">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/annotation-detector-3.0.2.jar!/" />
<root url="jar://$MODULE_DIR$/lib/opencsv-4.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="hamcrest-core-1.3.0RC1.jar">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.0RC1.jar!/" />
<root url="jar://$MODULE_DIR$/lib/guava-26.0-jre.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="hamcrest-library-1.3.0RC1.jar">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.0RC1.jar!/" />
<root url="jar://$MODULE_DIR$/lib/logback-classic-1.2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jmock-2.6.0-RC2.jar">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-2.6.0-RC2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jmock-junit4-2.6.0-RC2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.6.0-RC2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="junit-dep-4.8.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/junit-dep-4.8.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="test-plugin.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/test-plugin.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="uispec4j-2.3-jdk16.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/uispec4j-2.3-jdk16.jar!/" />
<root url="jar://$MODULE_DIR$/lib/logback-core-1.2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />

BIN
core/lib/annotation-detector-3.0.2.jar
View File

Binary file not shown.

BIN
core/lib/annotation-detector-3.0.5.jar Normal file
View File

Binary file not shown.

BIN
core/lib/guava-26.0-jre.jar Normal file
View File

Binary file not shown.

BIN
core/lib/guice-3.0.jar
View File

Binary file not shown.

BIN
core/lib/guice-4.2.1.jar Normal file
View File

Binary file not shown.

BIN
core/lib/guice-multibindings-3.0.jar
View File

Binary file not shown.

BIN
core/lib/istack-commons-runtime.jar Normal file
View File

Binary file not shown.

BIN
core/lib/istack-commons-tools.jar Normal file
View File

Binary file not shown.

BIN
core/lib/javax.activation-api-2.3.1.jar Normal file
View File

Binary file not shown.

BIN
core/lib/javax.json-1.1.3.jar Normal file
View File

Binary file not shown.

BIN
core/lib/javax.json-api-1.1.3.jar Normal file
View File

Binary file not shown.

BIN
core/lib/jaxb-api.2.3.1.jar Normal file
View File

Binary file not shown.

BIN
core/lib/jaxb-runtime.2.3.1.jar Normal file
View File

Binary file not shown.

BIN
core/lib/logback-classic-1.2.3.jar Normal file
View File

Binary file not shown.

BIN
core/lib/logback-core-1.2.3.jar Normal file
View File

Binary file not shown.

BIN
core/lib/opencsv-2.3.jar
View File

Binary file not shown.

BIN
core/lib/opencsv-4.3.2.jar Normal file
View File

Binary file not shown.

BIN
core/lib/yasson-1.0.2.jar Normal file
View File

Binary file not shown.

2
core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java
View File

@ -14,7 +14,7 @@ import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.ArrayList;
import net.sf.openrocket.util.StringUtil;
import au.com.bytecode.opencsv.CSVReader;
import com.opencsv.CSVReader;
/**
* Primary entry point for parsing component CSV files that are in Rocksim format.

31
lib-test/OpenRocket Test Libraries.iml
View File

@ -17,52 +17,52 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
<orderEntry type="module-library">
<library name="hamcrest-core-1.3.0RC1.jar">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/hamcrest-core-1.3.0RC1.jar!/" />
<root url="jar://$MODULE_DIR$/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="hamcrest-library-1.3.0RC1.jar">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/hamcrest-library-1.3.0RC1.jar!/" />
<root url="jar://$MODULE_DIR$/hamcrest-library-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jmock-2.6.0-RC2.jar">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/jmock-2.6.0-RC2.jar!/" />
<root url="jar://$MODULE_DIR$/jmock-2.9.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jmock-junit4-2.6.0-RC2.jar">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/jmock-junit4-2.6.0-RC2.jar!/" />
<root url="jar://$MODULE_DIR$/jmock-junit4-2.9.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="junit-dep-4.8.2.jar">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/junit-dep-4.8.2.jar!/" />
<root url="jar://$MODULE_DIR$/junit-4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="test-plugin.jar">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/test-plugin.jar!/" />
</CLASSES>
@ -70,14 +70,5 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="uispec4j-2.3-jdk16.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/uispec4j-2.3-jdk16.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

BIN
lib-test/hamcrest-core-1.3.0RC1.jar
View File

Binary file not shown.

BIN
lib-test/hamcrest-core-1.3.jar Normal file
View File

Binary file not shown.

BIN
lib-test/hamcrest-library-1.3.0RC1.jar
View File

Binary file not shown.

BIN
lib-test/hamcrest-library-1.3.jar Normal file
View File

Binary file not shown.

BIN
lib-test/jmock-2.6.0-RC2.jar
View File

Binary file not shown.

BIN
lib-test/jmock-2.9.0.jar Normal file
View File

Binary file not shown.

BIN
lib-test/jmock-junit4-2.6.0-RC2.jar
View File

Binary file not shown.

BIN
lib-test/jmock-junit4-2.9.0.jar Normal file
View File

Binary file not shown.

BIN
lib-test/junit-4.12.jar Normal file
View File

Binary file not shown.

BIN
lib-test/junit-dep-4.8.2.jar
View File

Binary file not shown.

BIN
lib-test/uispec4j-2.3-jdk16.jar
View File

Binary file not shown.

166
swing/OpenRocket Swing.iml
View File

@ -34,6 +34,7 @@
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="OpenRocket Core" />
<orderEntry type="module-library">
<library name="iText-5.0.2.jar">
<CLASSES>
@ -70,7 +71,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="OpenRocket Core" />
<orderEntry type="module-library">
<library name="slf4j-api-1.7.5.jar">
<CLASSES>
@ -89,24 +89,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="guice-3.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/guice-3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="guice-multibindings-3.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/guice-multibindings-3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="javax.inject.jar">
<CLASSES>
@ -116,33 +98,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="opencsv-2.3.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/opencsv-2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="logback-classic-1.0.12.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/logback-classic-1.0.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="logback-core-1.0.12.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/logback-core-1.0.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="resources">
<CLASSES>
@ -161,15 +116,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="annotation-detector-3.0.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/annotation-detector-3.0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="miglayout-4.0-swing.jar">
<CLASSES>
@ -190,77 +136,43 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.0RC1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.0RC1.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.0RC1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.0RC1.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-2.6.0-RC2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-2.6.0-RC2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.6.0-RC2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.6.0-RC2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/junit-dep-4.8.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/test-plugin.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/uispec4j-2.3-jdk16.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="jogl" level="project" />
<orderEntry type="library" name="lib-test" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/guice-4.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/guava-26.0-jre.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/logback-classic-1.2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/logback-core-1.2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>
</module>

20
swing/build.xml
View File

@ -92,19 +92,27 @@
<!-- Libraries to extract into base JAR -->
<zipfileset src="${core.dir}/build/jar/OpenRocket-Core.jar" />
<zipfileset src="${lib.dir}/miglayout-4.0-swing.jar" />
<zipfileset src="${core.dir}/lib/guice-3.0.jar" />
<zipfileset src="${core.dir}/lib/guava-26.0-jre.jar" />
<zipfileset src="${core.dir}/lib/guice-4.2.1.jar" />
<zipfileset src="${core.dir}/lib/aopalliance.jar"/>
<zipfileset src="${core.dir}/lib/guice-multibindings-3.0.jar"/>
<zipfileset src="${lib.dir}/iText-5.0.2.jar"/>
<zipfileset src="${core.dir}/lib/istack-commons-runtime.jar"/>
<zipfileset src="${core.dir}/lib/istack-commons-tools.jar"/>
<zipfileset src="${core.dir}/lib/javax.activation-api-2.3.1.jar"/>
<zipfileset src="${core.dir}/lib/javax.inject.jar"/>
<zipfileset src="${core.dir}/lib/javax.json-1.1.3.jar"/>
<zipfileset src="${core.dir}/lib/javax.json-api-1.1.3.jar"/>
<zipfileset src="${core.dir}/lib/jaxb-api.2.3.1.jar"/>
<zipfileset src="${core.dir}/lib/jaxb-runtime.2.3.1.jar"/>
<zipfileset src="${lib.dir}/jcommon-1.0.18.jar"/>
<zipfileset src="${lib.dir}/jfreechart-1.0.15.jar"/>
<zipfileset src="${core.dir}/lib/opencsv-2.3.jar"/>
<zipfileset src="${core.dir}/lib/opencsv-4.3.2.jar"/>
<zipfileset src="${lib.dir}/OrangeExtensions-1.2.jar"/>
<zipfileset src="${core.dir}/lib/annotation-detector-3.0.2.jar"/>
<zipfileset src="${core.dir}/lib/annotation-detector-3.0.5.jar"/>
<zipfileset src="${core.dir}/lib/slf4j-api-1.7.5.jar"/>
<zipfileset src="${lib.dir}/logback-classic-1.0.12.jar"/>
<zipfileset src="${lib.dir}/logback-core-1.0.12.jar"/>
<zipfileset src="${core.dir}/lib/logback-classic-1.2.3.jar"/>
<zipfileset src="${core.dir}/lib/logback-core-1.2.3.jar"/>
<zipfileset src="${lib.dir}/rsyntaxtextarea-2.5.6.jar"/>

BIN
swing/lib/logback-classic-1.0.12.jar
View File

Binary file not shown.

BIN
swing/lib/logback-core-1.0.12.jar
View File

Binary file not shown.