Merge branch 'hotfix/v0.2.1'

artclarke · Jan 3, 2015 · 2e27465 · 2e27465
2 parents 94373fc + 1071604
commit 2e27465
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ If using Maven, Humble is deployed to the Maven Central Repository. To include i
     <dependency>
       <groupId>io.humble</groupId>
       <artifactId>humble-video-all</artifactId>
-      <version>0.2.0</version>
+      <version>0.2.1</version>
     </dependency>
   </dependencies>
 </project>
@@ -192,14 +192,14 @@ vagrant up && mvn install && vagrant ssh --command "cd /vagrant && mvn install"
 
 9. If successful, it's time to PEG the snapshots to a specific release. Now things get hairy.
 
+Edit humble-video-parent/pom.xml BY HAND to set the humble.version
 ```bash
 cd humble-video-parent && mvn -Pdeploy versions:set -DnewVersion=<version-number>
 ```
-
 10. Now, rebuild all Java Source
 
 ```bash
-(cd humble-video-noarch && mvn clean) && (cd humble-video-test && mvn clean)
+(cd humble-video-noarch && mvn clean) && (cd humble-video-test && mvn clean) && (cd humble-video-demos && mvn clean)
 ```
 
 11. Do one last rebuild (you do not need to rebuild native sources) and deploy
@@ -212,22 +212,31 @@ vagrant up && mvn install && vagrant ssh --command "cd /vagrant && mvn install"
 
     https://oss.sonatype.org/content/repositories/snapshots/io/humble/
 
-13. Merge your changes back into Develop
+13. Make sure it was done correctly by deleting all your m2 artifacts, and forcing a redownload.
+
+```bash
+rm -rf $HOME/.m2/repository/io/humble/humble-video-*
+(cd humble-video-tests && mvn test)
+(cd humble-video-demos && mvn test)
+```
+
+14. Merge your changes back into Develop
 
 ```bash
 git flow release finish v<version-number>
 ```
 
-14. Peg your develop tree to the next snapshot.
+15. Peg your develop tree to the next snapshot.
 
+Edit humble-video-parent/pom.xml BY HAND to set the humble.version
 ```bash
 cd humble-video-parent && mvn -Pdeploy versions:set -DnewVersion=<version-number>-SNAPSHOT
 cd humble-video-noarch/src/main/gnu
 <edit configure.ac to update version numbers in an editor of your choice>
 autoreconf
 ```
 
-15. Done!
+16. Done!
 
 Enjoy!
 

diff --git a/humble-video-all/pom.xml b/humble-video-all/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-captive/pom.xml b/humble-video-captive/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-demos/pom.xml b/humble-video-demos/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.2.1</version>
     <relativePath>../humble-video-parent/pom.xml</relativePath>
   </parent>
 
@@ -35,15 +35,7 @@
     </dependency>
     <dependency>
       <groupId>io.humble</groupId>
-      <artifactId>humble-video-arch-x86_64-apple-darwin12-debug</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.humble</groupId>
-      <artifactId>humble-video-arch-i686-apple-darwin12-debug</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.humble</groupId>
-      <artifactId>humble-video-noarch</artifactId>
+      <artifactId>humble-video-all</artifactId>
     </dependency>
     <dependency>
     	<groupId>commons-cli</groupId>

diff --git a/humble-video-native/pom.xml b/humble-video-native/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-native/src/main/gnu/configure b/humble-video-native/src/main/gnu/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for humble-video 0.2.0.
+# Generated by GNU Autoconf 2.69 for humble-video 0.2.1.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='humble-video'
 PACKAGE_TARNAME='humble-video'
-PACKAGE_VERSION='0.2.0'
-PACKAGE_STRING='humble-video 0.2.0'
+PACKAGE_VERSION='0.2.1'
+PACKAGE_STRING='humble-video 0.2.1'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1445,7 +1445,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures humble-video 0.2.0 to adapt to many kinds of systems.
+\`configure' configures humble-video 0.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1515,7 +1515,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of humble-video 0.2.0:";;
+     short | recursive ) echo "Configuration of humble-video 0.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1654,7 +1654,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-humble-video configure 0.2.0
+humble-video configure 0.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2483,7 +2483,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by humble-video $as_me 0.2.0, which was
+It was created by humble-video $as_me 0.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3348,7 +3348,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='humble-video'
- VERSION='0.2.0'
+ VERSION='0.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16898,7 +16898,7 @@ fi
 
 LIB_MAJOR_VERSION=0
 LIB_MINOR_VERSION=2
-LIB_PATCH_VERSION=0
+LIB_PATCH_VERSION=1
 VS_PROJECT_NAME=humble-video
 
 
@@ -16911,7 +16911,7 @@ $as_echo "#define VS_LIB_MAJOR_VERSION 0" >>confdefs.h
 $as_echo "#define VS_LIB_MINOR_VERSION 2" >>confdefs.h
 
 
-$as_echo "#define VS_LIB_PATCH_VERSION 0" >>confdefs.h
+$as_echo "#define VS_LIB_PATCH_VERSION 1" >>confdefs.h
 
 
 $as_echo "#define VS_PROJECT_NAME humble-video" >>confdefs.h
@@ -21288,7 +21288,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by humble-video $as_me 0.2.0, which was
+This file was extended by humble-video $as_me 0.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21354,7 +21354,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-humble-video config.status 0.2.0
+humble-video config.status 0.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/humble-video-native/src/main/gnu/configure.ac b/humble-video-native/src/main/gnu/configure.ac
@@ -6,7 +6,7 @@
 # JAVA build.xml FILE
 m4_define([VSM4_LIB_MAJOR_VERSION], [0])
 m4_define([VSM4_LIB_MINOR_VERSION], [2])
-m4_define([VSM4_LIB_PATCH_VERSION], [0])
+m4_define([VSM4_LIB_PATCH_VERSION], [1])
 m4_define([VSM4_PROJECT_NAME], [humble-video])
 
 AC_INIT(VSM4_PROJECT_NAME,[VSM4_LIB_MAJOR_VERSION.VSM4_LIB_MINOR_VERSION.VSM4_LIB_PATCH_VERSION],[[email protected]])

diff --git a/humble-video-noarch/pom.xml b/humble-video-noarch/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-parent/pom.xml b/humble-video-parent/pom.xml
@@ -2,13 +2,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.humble</groupId>
   <artifactId>humble-video-parent</artifactId>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
   <packaging>pom</packaging>
   <name>humble-video-parent</name>
   <url>http://www.humble.io</url>
 
   <properties>
-    <humble.version>0.2.0-SNAPSHOT</humble.version>
+    <humble.version>0.2.1</humble.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
     <humble.build.timestamp>${maven.build.timestamp}</humble.build.timestamp>
@@ -131,6 +131,7 @@
               -nodefontsize 9
               -nodefontpackagesize 7
               -enumerations
+              -Xdoclint:none
             </additionalparam>
             <useStandardDocletOptions>true</useStandardDocletOptions>
           </configuration>

diff --git a/humble-video-stage/humble-video-arch-i686-apple-darwin12-debug/pom.xml b/humble-video-stage/humble-video-arch-i686-apple-darwin12-debug/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/humble-video-arch-i686-apple-darwin12/pom.xml b/humble-video-stage/humble-video-arch-i686-apple-darwin12/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/humble-video-arch-i686-pc-linux-gnu6-debug/pom.xml b/humble-video-stage/humble-video-arch-i686-pc-linux-gnu6-debug/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/humble-video-arch-i686-pc-linux-gnu6/pom.xml b/humble-video-stage/humble-video-arch-i686-pc-linux-gnu6/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/humble-video-arch-i686-w64-mingw32-debug/pom.xml b/humble-video-stage/humble-video-arch-i686-w64-mingw32-debug/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/humble-video-arch-i686-w64-mingw32/pom.xml b/humble-video-stage/humble-video-arch-i686-w64-mingw32/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/humble-video-arch-x86_64-apple-darwin12-debug/pom.xml b/humble-video-stage/humble-video-arch-x86_64-apple-darwin12-debug/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/humble-video-arch-x86_64-apple-darwin12/pom.xml b/humble-video-stage/humble-video-arch-x86_64-apple-darwin12/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/humble-video-arch-x86_64-pc-linux-gnu6-debug/pom.xml b/humble-video-stage/humble-video-arch-x86_64-pc-linux-gnu6-debug/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/humble-video-arch-x86_64-pc-linux-gnu6/pom.xml b/humble-video-stage/humble-video-arch-x86_64-pc-linux-gnu6/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/humble-video-arch-x86_64-w64-mingw32-debug/pom.xml b/humble-video-stage/humble-video-arch-x86_64-w64-mingw32-debug/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/humble-video-arch-x86_64-w64-mingw32/pom.xml b/humble-video-stage/humble-video-arch-x86_64-w64-mingw32/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-stage/pom.xml b/humble-video-stage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/humble-video-test/pom.xml b/humble-video-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>../humble-video-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.humble</groupId>
     <artifactId>humble-video-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <relativePath>./humble-video-parent/pom.xml</relativePath>
   </parent>
 
@@ -33,6 +33,7 @@
         <module>humble-video-native</module>
         <module>humble-video-noarch</module>
         <module>humble-video-test</module>
+        <module>humble-video-demos</module>
       </modules>
       <activation>
         <!-- activate when a file is missing, which should be always. This