Update version in the pom.xml files to 1.5.10-SNAPSHOT

anotherche · Jun 11, 2023 · ee37ba8 · ee37ba8
1 parent 4a986b3
commit ee37ba8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/.github/workflows/javacv.yml b/.github/workflows/javacv.yml
@@ -10,7 +10,6 @@ env:
 jobs:
   linux-x86_64:
     runs-on: ubuntu-20.04
-    container: ubuntu:bionic
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
       - uses: mxschmitt/[email protected]

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.10-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
 
@@ -43,47 +43,47 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>flycapture-platform</artifactId>
-      <version>2.13.3.31-${javacpp.version}</version>
+      <version>2.13.3.31-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>libdc1394-platform</artifactId>
-      <version>2.2.6-${javacpp.version}</version>
+      <version>2.2.6-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>libfreenect-platform</artifactId>
-      <version>0.5.7-${javacpp.version}</version>
+      <version>0.5.7-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>libfreenect2-platform</artifactId>
-      <version>0.2.0-${javacpp.version}</version>
+      <version>0.2.0-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>librealsense-platform</artifactId>
-      <version>1.12.4-${javacpp.version}</version>
+      <version>1.12.4-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>librealsense2-platform</artifactId>
-      <version>2.53.1-${javacpp.version}</version>
+      <version>2.53.1-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>videoinput-platform</artifactId>
-      <version>0.200-${javacpp.version}</version>
+      <version>0.200-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>artoolkitplus-platform</artifactId>
-      <version>2.3.1-${javacpp.version}</version>
+      <version>2.3.1-1.5.9</version>
     </dependency>
 <!--    <dependency>-->
 <!--      <groupId>org.bytedeco</groupId>-->
 <!--      <artifactId>flandmark-platform</artifactId>-->
-<!--      <version>1.07-${javacpp.version}</version>-->
+<!--      <version>1.07-1.5.8</version>-->
 <!--    </dependency>-->
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -102,6 +102,19 @@
       <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.bytedeco</groupId>
+      <artifactId>opencv-platform-gpu</artifactId>
+      <version>4.7.0-${javacpp.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bytedeco</groupId>
+      <artifactId>ffmpeg-platform-gpl</artifactId>
+      <version>6.0-${javacpp.version}</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.bytedeco</groupId>
   <artifactId>javacv</artifactId>
-  <version>1.5.9</version>
+  <version>1.5.10-SNAPSHOT</version>
 
   <name>JavaCV</name>
   <description>Java interface to OpenCV, FFmpeg, and more</description>
@@ -85,47 +85,47 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>flycapture</artifactId>
-      <version>2.13.3.31-${javacpp.version}</version>
+      <version>2.13.3.31-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>libdc1394</artifactId>
-      <version>2.2.6-${javacpp.version}</version>
+      <version>2.2.6-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>libfreenect</artifactId>
-      <version>0.5.7-${javacpp.version}</version>
+      <version>0.5.7-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>libfreenect2</artifactId>
-      <version>0.2.0-${javacpp.version}</version>
+      <version>0.2.0-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>librealsense</artifactId>
-      <version>1.12.4-${javacpp.version}</version>
+      <version>1.12.4-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>librealsense2</artifactId>
-      <version>2.53.1-${javacpp.version}</version>
+      <version>2.53.1-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>videoinput</artifactId>
-      <version>0.200-${javacpp.version}</version>
+      <version>0.200-1.5.9</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>artoolkitplus</artifactId>
-      <version>2.3.1-${javacpp.version}</version>
+      <version>2.3.1-1.5.9</version>
     </dependency>
 <!--    <dependency>-->
 <!--      <groupId>org.bytedeco</groupId>-->
 <!--      <artifactId>flandmark</artifactId>-->
-<!--      <version>1.07-${javacpp.version}</version>-->
+<!--      <version>1.07-1.5.8</version>-->
 <!--    </dependency>-->
     <dependency>
       <groupId>org.bytedeco</groupId>