From 1b8ed566b4a272476a5ab2f2ded6308409974fa0 Mon Sep 17 00:00:00 2001 From: Art Clarke Date: Sat, 3 Jan 2015 08:29:44 -0800 Subject: [PATCH 1/2] fix demos, peg to 0.2.1, and update readme. --- README.md | 21 +++++++++++----- humble-video-all/pom.xml | 2 +- humble-video-captive/pom.xml | 2 +- humble-video-demos/pom.xml | 2 +- humble-video-native/pom.xml | 2 +- humble-video-native/src/main/gnu/configure | 24 +++++++++---------- humble-video-native/src/main/gnu/configure.ac | 2 +- humble-video-noarch/pom.xml | 2 +- humble-video-parent/pom.xml | 5 ++-- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- humble-video-stage/pom.xml | 2 +- humble-video-test/pom.xml | 2 +- pom.xml | 3 ++- 24 files changed, 52 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 00bbbc00..1b1688de 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If using Maven, Humble is deployed to the Maven Central Repository. To include i io.humble humble-video-all - 0.2.0 + 0.2.1 @@ -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= ``` - 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,14 +212,23 @@ 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 ``` -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=-SNAPSHOT cd humble-video-noarch/src/main/gnu @@ -227,7 +236,7 @@ cd humble-video-noarch/src/main/gnu autoreconf ``` -15. Done! +16. Done! Enjoy! diff --git a/humble-video-all/pom.xml b/humble-video-all/pom.xml index 0bcb64cc..b7a5aba9 100644 --- a/humble-video-all/pom.xml +++ b/humble-video-all/pom.xml @@ -5,7 +5,7 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../humble-video-parent/pom.xml diff --git a/humble-video-captive/pom.xml b/humble-video-captive/pom.xml index 068af640..698aa10e 100644 --- a/humble-video-captive/pom.xml +++ b/humble-video-captive/pom.xml @@ -3,7 +3,7 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../humble-video-parent/pom.xml diff --git a/humble-video-demos/pom.xml b/humble-video-demos/pom.xml index 3ed27362..cd35e928 100644 --- a/humble-video-demos/pom.xml +++ b/humble-video-demos/pom.xml @@ -5,7 +5,7 @@ io.humble humble-video-parent - 0.2.0-SNAPSHOT + 0.2.1 ../humble-video-parent/pom.xml diff --git a/humble-video-native/pom.xml b/humble-video-native/pom.xml index 3678cbb6..cf84869e 100644 --- a/humble-video-native/pom.xml +++ b/humble-video-native/pom.xml @@ -3,7 +3,7 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../humble-video-parent/pom.xml diff --git a/humble-video-native/src/main/gnu/configure b/humble-video-native/src/main/gnu/configure index f13b3d2b..b97f840c 100755 --- 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 . # @@ -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='info@humble.io' 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 index 2bbff5ba..2a15dffa 100644 --- 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],[info@humble.io]) diff --git a/humble-video-noarch/pom.xml b/humble-video-noarch/pom.xml index 1cadf1a6..4d50cdf5 100644 --- a/humble-video-noarch/pom.xml +++ b/humble-video-noarch/pom.xml @@ -4,7 +4,7 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../humble-video-parent/pom.xml diff --git a/humble-video-parent/pom.xml b/humble-video-parent/pom.xml index 312fc6a2..e3ef3f97 100644 --- a/humble-video-parent/pom.xml +++ b/humble-video-parent/pom.xml @@ -2,13 +2,13 @@ 4.0.0 io.humble humble-video-parent - 0.2.0 + 0.2.1 pom humble-video-parent http://www.humble.io - 0.2.0-SNAPSHOT + 0.2.1 UTF-8 yyyy-MM-dd HH:mm:ss ${maven.build.timestamp} @@ -131,6 +131,7 @@ -nodefontsize 9 -nodefontpackagesize 7 -enumerations + -Xdoclint:none true 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 index 160cad54..b81d0337 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml 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 index 0c7ff892..e7a970e9 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml 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 index 4376a272..c8a0b5e2 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml 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 index e1da4651..0380107f 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml 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 index ee1af558..b2fadb90 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml 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 index dce0d1a1..d01d6a77 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml 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 index c908500b..4aba2382 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml 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 index 80e8b207..91479d49 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml 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 index 2b13f942..9cb3d23e 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml 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 index 33605cbf..e082d151 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml 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 index f6cc9b27..0cfc6605 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml 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 index 59216413..5dc3bf71 100644 --- 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 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../../humble-video-parent/pom.xml diff --git a/humble-video-stage/pom.xml b/humble-video-stage/pom.xml index 7f0ef93e..837c2113 100644 --- a/humble-video-stage/pom.xml +++ b/humble-video-stage/pom.xml @@ -5,7 +5,7 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../humble-video-parent/pom.xml diff --git a/humble-video-test/pom.xml b/humble-video-test/pom.xml index d5028c10..70a827c7 100644 --- a/humble-video-test/pom.xml +++ b/humble-video-test/pom.xml @@ -4,7 +4,7 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ../humble-video-parent/pom.xml diff --git a/pom.xml b/pom.xml index cf44a000..0b6db58b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ io.humble humble-video-parent - 0.2.0 + 0.2.1 ./humble-video-parent/pom.xml @@ -33,6 +33,7 @@ humble-video-native humble-video-noarch humble-video-test + humble-video-demos