Skip to content

Commit

Permalink
jAER: update JARs. JavaCV to 1.1, commons-math3 to 3.6.1, commons-net…
Browse files Browse the repository at this point in the history
… to 3.4, nrjavaserial to 3.11.0.

git-svn-id: https://svn.code.sf.net/p/jaer/code/jAER/trunk@8398 b7f4320f-462c-0410-a916-d9f35bb82d52
  • Loading branch information
llongi committed Mar 30, 2016
1 parent b8258de commit 6fd9a60
Show file tree
Hide file tree
Showing 17 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<classpathentry kind="lib" path="jars/javacv/javacv.jar"/>
<classpathentry kind="lib" path="jars/swing-layout-1.0.4.jar"/>
<classpathentry kind="lib" path="jars/UsbIoJava.jar"/>
<classpathentry kind="lib" path="jars/commons-net-3.3.jar">
<classpathentry kind="lib" path="jars/commons-net-3.4.jar">
<attributes>
<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-net/apidocs/"/>
</attributes>
Expand Down Expand Up @@ -52,7 +52,7 @@
<classpathentry kind="lib" path="jars/usb4java/libusb4java-1.2.0-windows-x86.jar"/>
<classpathentry kind="lib" path="jars/usb4java/usb4java-1.2.0.jar"/>
<classpathentry kind="lib" path="jars/commons-lang3-3.4.jar"/>
<classpathentry kind="lib" path="jars/nrjavaserial-3.9.3.jar"/>
<classpathentry kind="lib" path="jars/nrjavaserial-3.11.0.jar"/>
<classpathentry kind="lib" path="jars/javacv/opencv-linux-x86_64.jar"/>
<classpathentry kind="lib" path="jars/javacv/opencv-linux-x86.jar"/>
<classpathentry kind="lib" path="jars/javacv/opencv-macosx-x86_64.jar"/>
Expand Down
Binary file removed jars/commons-math3-3.5.jar
Binary file not shown.
Binary file added jars/commons-math3-3.6.1.jar
Binary file not shown.
Binary file removed jars/commons-net-3.3.jar
Binary file not shown.
Binary file added jars/commons-net-3.4.jar
Binary file not shown.
Binary file modified jars/javacv/javacpp.jar
Binary file not shown.
Binary file modified jars/javacv/javacv.jar
Binary file not shown.
Binary file modified jars/javacv/opencv-linux-x86.jar
Binary file not shown.
Binary file modified jars/javacv/opencv-linux-x86_64.jar
Binary file not shown.
Binary file modified jars/javacv/opencv-macosx-x86_64.jar
Binary file not shown.
Binary file modified jars/javacv/opencv-windows-x86.jar
Binary file not shown.
Binary file modified jars/javacv/opencv-windows-x86_64.jar
Binary file not shown.
Binary file modified jars/javacv/opencv.jar
Binary file not shown.
8 changes: 4 additions & 4 deletions jars/libs.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ant - ??? - NetBeans IDE
betterbeansbindings - 1.3.0 - https://kenai.com/projects/betterbeansbinding/
commons-lang3 - 3.4 - https://commons.apache.org/proper/commons-lang/
commons-math3 - 3.5 - http://commons.apache.org/proper/commons-math/
commons-net - 3.3 - http://commons.apache.org/proper/commons-net/
JavaCV - 0.11 - https://github.com/bytedeco/
commons-math3 - 3.6.1 - http://commons.apache.org/proper/commons-math/
commons-net - 3.4 - http://commons.apache.org/proper/commons-net/
JavaCV - 1.1 - https://github.com/bytedeco/
javax.comm (comm) - ??? - http://www.oracle.com/technetwork/java/index-jsp-141752.html
javax.mail - 1.5.0 - https://java.net/projects/javamail/
jblas - 1.2.4 - http://jblas.org/
JEvtLearn - ??? - ???
jlfgr (Java Look&Feel Graphics Repository) - 1.0 - http://www.oracle.com/technetwork/java/index-138612.html
JOGL - 2.3.2 - https://jogamp.org/jogl/
nrjavaserial - 3.9.3 - https://github.com/NeuronRobotics/nrjavaserial/
nrjavaserial - 3.11.0 - https://github.com/NeuronRobotics/nrjavaserial/
phidget21 - 2.1.8.20130618 - http://www.phidgets.com/docs/Language_-_Java
svgSalamander-tiny - downloaded on 2013-07-13 - https://svgsalamander.java.net/
swing-layout - 1.0.4 - NetBeans IDE
Expand Down
Binary file added jars/nrjavaserial-3.11.0.jar
Binary file not shown.
Binary file removed jars/nrjavaserial-3.9.3.jar
Binary file not shown.
12 changes: 6 additions & 6 deletions nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ file.reference.ant.jar=jars/ant.jar
file.reference.betterbeansbinding-1.3.0-all.jar=jars/betterbeansbinding-1.3.0-all.jar
file.reference.comm.jar=jars/comm.jar
file.reference.commons-lang3-3.4.jar=jars/commons-lang3-3.4.jar
file.reference.commons-math3-3.5.jar=jars/commons-math3-3.5.jar
file.reference.commons-net-3.3.jar=jars/commons-net-3.3.jar
file.reference.commons-math3-3.6.1.jar=jars/commons-math3-3.6.1.jar
file.reference.commons-net-3.4.jar=jars/commons-net-3.4.jar
file.reference.gluegen-rt.jar=jars/jogl/gluegen-rt.jar
file.reference.javacpp.jar=jars/javacv/javacpp.jar
file.reference.javax.mail-1.5.0.jar=jars/javax.mail-1.5.0.jar
Expand All @@ -36,7 +36,7 @@ file.reference.libusb4java-1.2.0-osx-x86.jar=jars/usb4java/libusb4java-1.2.0-osx
file.reference.libusb4java-1.2.0-osx-x86_64.jar=jars/usb4java/libusb4java-1.2.0-osx-x86_64.jar
file.reference.libusb4java-1.2.0-windows-x86.jar=jars/usb4java/libusb4java-1.2.0-windows-x86.jar
file.reference.libusb4java-1.2.0-windows-x86_64.jar=jars/usb4java/libusb4java-1.2.0-windows-x86_64.jar
file.reference.nrjavaserial-3.9.3.jar=jars/nrjavaserial-3.9.3.jar
file.reference.nrjavaserial-3.11.0.jar=jars/nrjavaserial-3.11.0.jar
file.reference.opencv-300.jar=filterSettings/OpenCV_Nets/lib/bin/opencv-300.jar
file.reference.opencv.jar=jars/javacv/opencv.jar
file.reference.org.openni.jar=jars\\openni2\\org.openni.jar
Expand Down Expand Up @@ -81,8 +81,8 @@ javac.classpath=\
${file.reference.betterbeansbinding-1.3.0-all.jar}:\
${file.reference.comm.jar}:\
${file.reference.commons-lang3-3.4.jar}:\
${file.reference.commons-math3-3.5.jar}:\
${file.reference.commons-net-3.3.jar}:\
${file.reference.commons-math3-3.6.1.jar}:\
${file.reference.commons-net-3.4.jar}:\
${file.reference.gluegen-rt.jar}:\
${file.reference.javacpp.jar}:\
${file.reference.javax.mail-1.5.0.jar}:\
Expand All @@ -96,7 +96,7 @@ javac.classpath=\
${file.reference.libusb4java-1.2.0-osx-x86_64.jar}:\
${file.reference.libusb4java-1.2.0-windows-x86.jar}:\
${file.reference.libusb4java-1.2.0-windows-x86_64.jar}:\
${file.reference.nrjavaserial-3.9.3.jar}:\
${file.reference.nrjavaserial-3.11.0.jar}:\
${file.reference.opencv.jar}:\
${file.reference.org.openni.jar}:\
${file.reference.phidget21-2.1.8.20130618.jar}:\
Expand Down

0 comments on commit 6fd9a60

Please sign in to comment.