Skip to content

Commit

Permalink
Dependency Updates (openrocket#1483)
Browse files Browse the repository at this point in the history 
* remove the resources\datafiles\presets folder as its is being built by the copy-orc-files build script

* Refactored from new Boolean and new Integer to Boolean.valueOf and Integer.valueOf due to deprecation warnings.   Value of is supported in Java 8 (https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html)

* Removed non-atomic updates around deprecation

* updated test dependencies

* dependency updates

* dependency updates
  • Loading branch information
@thzero
thzero authored Jun 26, 2022
1 parent e82564a commit c2c2269
Show file tree
Hide file tree
Showing 29 changed files with 96 additions and 86 deletions.
7 changes: 3 additions & 4 deletions .idea/artifacts/openrocket_jar.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions core/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
<classpathentry kind="lib" path="resources"/>
<classpathentry kind="lib" path="lib/javax.inject.jar"/>
<classpathentry kind="lib" path="lib/aopalliance.jar"/>
<classpathentry kind="lib" path="lib/commonmark-0.18.1.jar"/>
<classpathentry kind="lib" path="lib/commonmark-0.19.0.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.30.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/>
<classpathentry kind="lib" path="lib/annotation-detector-3.0.5.jar"/>
<classpathentry kind="lib" path="lib/guice-4.2.3-no_aop.jar"/>
<classpathentry kind="lib" path="lib/logback-classic-1.2.3.jar"/>
<classpathentry kind="lib" path="lib/logback-core-1.2.3.jar"/>
<classpathentry kind="lib" path="lib/logback-classic-1.2.11.jar"/>
<classpathentry kind="lib" path="lib/logback-core-1.2.11.jar"/>
<classpathentry kind="lib" path="lib/opencsv-4.3.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-library-1.3.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.9.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.9.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.12.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-2.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-2.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.12.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.12.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.13.2.jar"/>
<classpathentry kind="lib" path="lib/jaxb-api.2.3.1.jar"/>
<classpathentry kind="lib" path="lib/jaxb-runtime.2.3.1.jar"/>
<classpathentry kind="lib" path="lib/guava-26.0-jre.jar"/>
Expand Down
48 changes: 24 additions & 24 deletions core/OpenRocket Core.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<libelement value="jar://$MODULE_DIR$/lib/aopalliance.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/slf4j-api-1.7.5.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/annotation-detector-3.0.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.0RC1.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.0RC1.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/jmock-2.6.0-RC2.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.6.0-RC2.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/junit-dep-4.8.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-core-2.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-2.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/jmock-2.12.0.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.12.0.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/junit-4.13.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/test-plugin.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/uispec4j-2.3-jdk16.jar!/" />
<src_description expected_position="0">
Expand All @@ -38,7 +38,7 @@
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.jar!/" />
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -47,7 +47,7 @@
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.jar!/" />
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -56,7 +56,7 @@
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-2.9.0.jar!/" />
<root url="jar://$MODULE_DIR$/../lib-test/jmock-2.12.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -65,16 +65,7 @@
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.9.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/junit-4.12.jar!/" />
<root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.12.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -89,10 +80,10 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/annotation-detector-3.0.5.jar!/" />
<root url="jar://$MODULE_DIR$/../lib-test/junit-4.13.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand Down Expand Up @@ -218,7 +209,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/logback-classic-1.2.3.jar!/" />
<root url="jar://$MODULE_DIR$/lib/logback-classic-1.2.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -227,7 +218,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/logback-core-1.2.3.jar!/" />
<root url="jar://$MODULE_DIR$/lib/logback-core-1.2.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand Down Expand Up @@ -262,9 +253,18 @@
</orderEntry>
<orderEntry type="module-library">
<library name="commonmark" type="repository">
<properties maven-id="org.commonmark:commonmark:0.18.1" />
<properties maven-id="org.commonmark:commonmark:0.19.0" />
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/commonmark-0.19.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/commonmark-0.18.1.jar!/" />
<root url="jar://$MODULE_DIR$/lib/annotation-detector-3.0.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand Down
6 changes: 6 additions & 0 deletions core/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@

<!-- BUILD -->
<target name="build">
<echo>Java/JVM version: ${ant.java.version}</echo>
<echo>Java/JVM detail version: ${java.version}</echo>
<mkdir dir="${classes.dir}"/>
<echo level="info">Compiling main classes</echo>
<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false" source="1.8" target="1.8"/>
Expand Down Expand Up @@ -87,10 +89,14 @@
<!-- Unit tests -->
<target name="unittest" description="Execute unit tests" depends="build">
<echo>Building unit tests</echo>
<echo>Java/JVM version: ${ant.java.version}</echo>
<echo>Java/JVM detail version: ${java.version}</echo>
<mkdir dir="${build-test.dir}"/>
<javac debug="true" srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath" includeantruntime="false"/>

<echo>Running unit tests</echo>
<echo>Java/JVM version: ${ant.java.version}</echo>
<echo>Java/JVM detail version: ${java.version}</echo>
<mkdir dir="${tmp.dir}/rawtestoutput"/>
<junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure" dir="${basedir}">
<classpath>
Expand Down
Binary file renamed core/lib/commonmark-0.18.1.jar → core/lib/commonmark-0.19.0.jar
View file
Binary file not shown.
Binary file added core/lib/logback-classic-1.2.11.jar
View file
Binary file not shown.
Binary file removed core/lib/logback-classic-1.2.3.jar
View file
Binary file not shown.
Binary file added core/lib/logback-core-1.2.11.jar
View file
Binary file not shown.
Binary file removed core/lib/logback-core-1.2.3.jar
View file
Binary file not shown.
Binary file removed core/lib/yasson-1.0.2.jar
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions lib-test/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test-plugin.jar"/>
<classpathentry kind="lib" path="hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="hamcrest-library-1.3.jar"/>
<classpathentry kind="lib" path="jmock-2.9.0.jar"/>
<classpathentry kind="lib" path="jmock-junit4-2.9.0.jar"/>
<classpathentry kind="lib" path="junit-4.12.jar"/>
<classpathentry kind="lib" path="hamcrest-core-2.2.jar"/>
<classpathentry kind="lib" path="hamcrest-2.2.jar"/>
<classpathentry kind="lib" path="jmock-2.12.0.jar"/>
<classpathentry kind="lib" path="jmock-junit4-2.12.0.jar"/>
<classpathentry kind="lib" path="junit-4.13.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
20 changes: 10 additions & 10 deletions lib-test/OpenRocket Test Libraries.iml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="EclipseModuleManager">
<libelement value="jar://$MODULE_DIR$/hamcrest-core-1.3.0RC1.jar!/" />
<libelement value="jar://$MODULE_DIR$/hamcrest-library-1.3.0RC1.jar!/" />
<libelement value="jar://$MODULE_DIR$/jmock-2.6.0-RC2.jar!/" />
<libelement value="jar://$MODULE_DIR$/jmock-junit4-2.6.0-RC2.jar!/" />
<libelement value="jar://$MODULE_DIR$/junit-dep-4.8.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/hamcrest-core-2.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/hamcrest-2.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/jmock-2.12.0.jar!/" />
<libelement value="jar://$MODULE_DIR$/jmock-junit4-2.12.0.jar!/" />
<libelement value="jar://$MODULE_DIR$/junit-4.13.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/test-plugin.jar!/" />
<libelement value="jar://$MODULE_DIR$/uispec4j-2.3-jdk16.jar!/" />
<src_description expected_position="0" />
Expand All @@ -19,7 +19,7 @@
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/hamcrest-core-1.3.jar!/" />
<root url="jar://$MODULE_DIR$/hamcrest-core-2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -28,7 +28,7 @@
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/hamcrest-library-1.3.jar!/" />
<root url="jar://$MODULE_DIR$/hamcrest-2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -37,7 +37,7 @@
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/jmock-2.9.0.jar!/" />
<root url="jar://$MODULE_DIR$/jmock-2.12.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -46,7 +46,7 @@
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/jmock-junit4-2.9.0.jar!/" />
<root url="jar://$MODULE_DIR$/jmock-junit4-2.12.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -55,7 +55,7 @@
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/junit-4.12.jar!/" />
<root url="jar://$MODULE_DIR$/junit-jupiter-api-5.8.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand Down
Binary file added lib-test/hamcrest-2.2.jar
View file
Binary file not shown.
Binary file removed lib-test/hamcrest-core-1.3.jar
View file
Binary file not shown.
Binary file added lib-test/hamcrest-core-2.2.jar
View file
Binary file not shown.
Binary file removed lib-test/hamcrest-library-1.3.jar
View file
Binary file not shown.
Binary file added lib-test/jmock-2.12.0.jar
View file
Binary file not shown.
Binary file removed lib-test/jmock-2.9.0.jar
View file
Binary file not shown.
Binary file added lib-test/jmock-junit4-2.12.0.jar
View file
Binary file not shown.
Binary file removed lib-test/jmock-junit4-2.9.0.jar
View file
Binary file not shown.
Binary file removed lib-test/junit-4.12.jar
View file
Binary file not shown.
Binary file added lib-test/junit-4.13.2.jar
View file
Binary file not shown.
18 changes: 9 additions & 9 deletions swing/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
<classpathentry combineaccessrules="false" kind="src" path="/OpenRocket Core"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/slf4j-api-1.7.30.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/aopalliance.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/commonmark-0.18.1.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/commonmark-0.19.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/javax.inject.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/resources"/>
<classpathentry kind="lib" path="resources"/>
<classpathentry kind="lib" path="lib/miglayout-4.0-swing.jar" sourcepath="reference/miglayout-4.0-sources.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.6.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea-3.2.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/annotation-detector-3.0.5.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/guice-4.2.3-no_aop.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-classic-1.2.3.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-core-1.2.3.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-library-1.3.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-classic-1.2.11.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-core-1.2.11.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-2.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-2.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/opencsv-4.3.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.9.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.9.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.12.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.12.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.12.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.13.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/jaxb-api.2.3.1.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/jaxb-runtime.2.3.1.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/guava-26.0-jre.jar"/>
Expand Down
Loading

0 comments on commit c2c2269

Please sign in to comment.