* Make all dependencies from the JavaCPP Presets optional to let use…

…rs select what they need (issue #10)
bytedeco · Jun 2, 2014 · 0e7cd79 · 0e7cd79
1 parent 858c52f
commit 0e7cd79
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Make all dependencies from the JavaCPP Presets optional to let users select what they need ([issue #10](https://github.com/bytedeco/javacv/issues/10))
  * Add new `RLSA` sample, thanks to Nicholas Woodward ([issue #469](http://code.google.com/p/javacv/issues/detail?id=469))
  * Fix a timestamp rounding issue in `FFmpegFrameGrabber` that causes `setFrameNumber()` to sometimes pick the wrong frame if FPS is not a proper divisor of 1000000 ([issue #5](https://github.com/bytedeco/javacv/issues/5))
  * Increase the flexibility of the `pom.xml` file by making it possible to specify a custom version of JavaCPP

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>0.8-1-SNAPSHOT</version>
+  <version>0.8-2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>JavaCV</name>
@@ -48,7 +48,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.build.timestamp.format>yyyyMMddhhmm</maven.build.timestamp.format>
-    <javacpp.version>0.8</javacpp.version>
+    <javacpp.version>${project.version}</javacpp.version>
     <platform>${os.name}-${os.arch}</platform> <!-- For Android: -Dplatform=android-arm -->
     <!-- Reinclude the following with profiles, either all: -Pall
          or selectively: -Pmarkers,ffmpeg,dc1394,flycapture,openkinect,ps3eye,videoinput,jogamp -->
@@ -75,95 +75,112 @@
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>opencv</artifactId>
       <version>2.4.9-${javacpp.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>ffmpeg</artifactId>
       <version>2.2.1-${javacpp.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>flycapture</artifactId>
       <version>1.7.17-${javacpp.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>libdc1394</artifactId>
       <version>2.2.2-${javacpp.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>libfreenect</artifactId>
       <version>0.4-${javacpp.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>videoinput</artifactId>
       <version>0.200-${javacpp.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>artoolkitplus</artifactId>
       <version>2.3.0-${javacpp.version}</version>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>opencv</artifactId>
       <version>2.4.9-${javacpp.version}</version>
       <classifier>${platform}</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>ffmpeg</artifactId>
       <version>2.2.1-${javacpp.version}</version>
       <classifier>${platform}</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>flycapture</artifactId>
       <version>1.7.17-${javacpp.version}</version>
       <classifier>${platform}</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>libdc1394</artifactId>
       <version>2.2.2-${javacpp.version}</version>
       <classifier>${platform}</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>libfreenect</artifactId>
       <version>0.4-${javacpp.version}</version>
       <classifier>${platform}</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>videoinput</artifactId>
       <version>0.200-${javacpp.version}</version>
       <classifier>${platform}</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>artoolkitplus</artifactId>
       <version>2.3.0-${javacpp.version}</version>
       <classifier>${platform}</classifier>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>org.jogamp.gluegen</groupId>
       <artifactId>gluegen-rt-main</artifactId>
       <version>2.0.2</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jogamp.jogl</groupId>
       <artifactId>jogl-all-main</artifactId>
       <version>2.0.2</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jogamp.jocl</groupId>
       <artifactId>jocl-main</artifactId>
       <version>2.0.2</version>
+      <optional>true</optional>
     </dependency>
   </dependencies>