diff --git a/chameleon-server/chameleon-vision.iml b/chameleon-server/chameleon-vision.iml index a3c362a46..4c5213fa3 100644 --- a/chameleon-server/chameleon-vision.iml +++ b/chameleon-server/chameleon-vision.iml @@ -11,6 +11,20 @@ + + + + + + + + + + + + + + @@ -48,20 +62,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/chameleon-server/pom.xml b/chameleon-server/pom.xml index bc1068049..aa16283cd 100644 --- a/chameleon-server/pom.xml +++ b/chameleon-server/pom.xml @@ -43,6 +43,8 @@ UTF-8 + 2020.1.1-beta-3-15-g7b9c6eb + 3.4.7-2 @@ -136,37 +138,37 @@ edu.wpi.first.cscore cscore-java - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} edu.wpi.first.cscore cscore-jni - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} linuxaarch64bionic edu.wpi.first.cscore cscore-jni - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} linuxraspbian edu.wpi.first.cscore cscore-jni - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} linuxx86-64 edu.wpi.first.cscore cscore-jni - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} osxx86-64 edu.wpi.first.cscore cscore-jni - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} windowsx86-64 @@ -174,45 +176,45 @@ edu.wpi.first.cameraserver cameraserver-java - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} edu.wpi.first.ntcore ntcore-java - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} edu.wpi.first.ntcore ntcore-jni - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} osxx86-64 edu.wpi.first.ntcore ntcore-jni - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} linuxraspbian edu.wpi.first.ntcore ntcore-jni - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} linuxx86-64 edu.wpi.first.ntcore ntcore-jni - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} linuxaarch64bionic edu.wpi.first.ntcore ntcore-jni - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} windowsx86-64 @@ -220,43 +222,43 @@ edu.wpi.first.wpiutil wpiutil-java - 2020.1.1-beta-3-12-gb8c1024 + ${wpilib.version} edu.wpi.first.thirdparty.frc2020.opencv opencv-java - 3.4.7-2 + ${opencv.version} edu.wpi.first.thirdparty.frc2020.opencv opencv-jni - 3.4.7-2 + ${opencv.version} linuxaarch64bionic edu.wpi.first.thirdparty.frc2020.opencv opencv-jni - 3.4.7-2 + ${opencv.version} linuxraspbian edu.wpi.first.thirdparty.frc2020.opencv opencv-jni - 3.4.7-2 + ${opencv.version} linuxx86-64 edu.wpi.first.thirdparty.frc2020.opencv opencv-jni - 3.4.7-2 + ${opencv.version} osxx86-64 edu.wpi.first.thirdparty.frc2020.opencv opencv-jni - 3.4.7-2 + ${opencv.version} windowsx86-64